Merge lp:~facundo/ubuntuone-client/query-no-content-file into lp:ubuntuone-client

[Facundo Batista]

Queue an upload again on SV_HASH_NEW if being LOCAL with hashes ok.

Queue an upload again on SV_HASH_NEW if being LOCAL with hashes ok.

Refactored the tests a little to include more cases.

[John O'Brien (jdobrien)]

I keep getting protocol errors when running make check and I'm using the latest protocol in trunk.

review: Needs Information

[John O'Brien (jdobrien)]

Looks good, all tests pass.

review: Approve

[Natalia Bidart (nataliabidart)]

Very nice.

review: Approve

=== modified file 'tests/syncdaemon/test_sync.py'
--- tests/syncdaemon/test_sync.py	2010-04-27 22:09:05 +0000
+++ tests/syncdaemon/test_sync.py	2010-05-06 19:17:36 +0000
@@ -30,7 +30,7 @@
 from contrib.testing.testcase import (
     FakeVolumeManager,
     BaseTwistedTestCase,
-    MementoHandler, DummyClass
+    MementoHandler
 )
 
 from contrib.testing import testcase
@@ -181,8 +181,8 @@
                              self.fsm.get_by_path(path).server_hash)
 
 
-class TestSync(BaseTwistedTestCase):
-    """Test for Sync."""
+class BaseSync(BaseTwistedTestCase):
+    """Base test infrastructure for Sync."""
 
     def setUp(self):
         """Init."""
@@ -219,6 +219,10 @@
                 raise exc_info[0], exc_info[1], exc_info[2]
         BaseTwistedTestCase.tearDown(self)
 
+
+class TestSync(BaseSync):
+    """Test for Sync."""
+
     def test_deleting_open_files_is_no_cause_for_despair(self):
         """test_deleting_open_files_is_no_cause_for_despair."""
         def cb(_):
@@ -257,8 +261,8 @@
         def faked_nothing(ssmr, event, params, *args):
             """Wrap SSMR.nothing to test."""
             self.called = True
+        self.patch(SyncStateMachineRunner, 'nothing', faked_nothing)
 
-        SyncStateMachineRunner.nothing = faked_nothing
         kwargs = dict(share_id='share_id', node_id='node_id')
         sync.handle_AQ_DOWNLOAD_DOES_NOT_EXIST(**kwargs)
         self.assertTrue(self.called, 'nothing was called')
@@ -271,7 +275,7 @@
         def faked_nothing(ssmr, event, params, *args):
             """Wrap SSMR.nothing to test."""
             self.called = True
-        SyncStateMachineRunner.nothing = faked_nothing
+        self.patch(SyncStateMachineRunner, 'nothing', faked_nothing)
 
         # create a file and put it in local
         fsm = self.main.fs
@@ -283,27 +287,60 @@
         sync.handle_FS_FILE_CREATE(somepath)
         self.assertTrue(self.called)
 
-
-class SyncStateMachineRunnerTestCase(BaseTwistedTestCase):
+    def test_SV_HASH_NEW_with_file_uploadinterrupted(self):
+        """A SV_HASH_NEW is received after upload interrupted."""
+        sync = Sync(main=self.main)
+        self.called = False
+
+        def fake_meth(_, event, params, hash):
+            """Wrap SSMR.reput_file_from_local to test."""
+            self.assertEqual(event, 'SV_HASH_NEW')
+            self.assertEqual(hash, '')
+            self.called = True
+        self.patch(SyncStateMachineRunner, 'reput_file_from_local', fake_meth)
+
+        # create a file and put it in local, without server_hash, as
+        # if the upload was cut in the middle after the make file
+        fsm = self.main.fs
+        somepath = os.path.join(self.root, 'somepath')
+        mdid = fsm.create(somepath, '', node_id='node_id')
+        fsm.set_by_mdid(mdid, local_hash='somehash', crc32='crc32',
+                        stat='stat', size='size')
+
+        # send the event and check
+        mdobj = fsm.get_by_mdid(mdid)
+        sync.handle_SV_HASH_NEW(mdobj.share_id, mdobj.node_id, '') # no content
+        self.assertTrue(self.called)
+
+
+class SyncStateMachineRunnerTestCase(BaseSync):
     """Tests for the SyncStateMachineRunner."""
 
     def setUp(self):
         """Init."""
-        BaseTwistedTestCase.setUp(self)
-        self.ssmr = SyncStateMachineRunner(fsm=None, main=None,
-                                           key=DummyClass(), logger=None)
+        BaseSync.setUp(self)
+
+        # create a file
+        self.fsm = self.main.fs
+        somepath = os.path.join(self.root, 'somepath')
+        self.mdid = self.fsm.create(somepath, '', node_id='node_id')
+
+        key = FSKey(self.main.fs, share_id='', node_id='node_id')
+        self.ssmr = SyncStateMachineRunner(fsm=self.main.fs, main=self.main,
+                                           key=key, logger=None)
         self.root = self.mktemp('root')
 
     def tearDown(self):
         """Clean up."""
         self.ssmr = None
-        shutil.rmtree(self.root)
-        BaseTwistedTestCase.tearDown(self)
+        BaseSync.tearDown(self)
 
-    def test_delete_file(self):
-        """delete_file can be called with or without the server hash."""
+    def test_delete_file_without_hash(self):
+        """Delete_file can be called without the server hash."""
         self.ssmr.delete_file(event='AQ_DOWNLOAD_ERROR', params=None)
 
+    def test_delete_file_with_hash(self):
+        """Delete_file can be called with the server hash."""
         self.ssmr.delete_file(event='AQ_DOWNLOAD_ERROR', params=None,
                               server_hash='')
 
@@ -333,3 +370,24 @@
         self.assertTrue("st_mtime" in log_msg)
         self.ssmr.log.removeHandler(handler)
 
+    def test_put_file_stores_info(self):
+        """The put_file method should store the info in FSM."""
+        self.ssmr.put_file('HQ_HASH_NEW', None, 'hash', 'crc', 'size', 'stt')
+
+        # check the info is stored
+        mdobj = self.fsm.get_by_mdid(self.mdid)
+        self.assertEqual(mdobj.local_hash, 'hash')
+        self.assertEqual(mdobj.crc32, 'crc')
+        self.assertEqual(mdobj.size, 'size')
+        self.assertEqual(mdobj.stat, 'stt')
+
+    def test_reput_file_stores_info(self):
+        """The reput_file method should store the info in FSM."""
+        self.ssmr.reput_file('HQ_HASH_NEW', None, 'hash', 'crc', 'size', 'stt')
+
+        # check the info is stored
+        mdobj = self.fsm.get_by_mdid(self.mdid)
+        self.assertEqual(mdobj.local_hash, 'hash')
+        self.assertEqual(mdobj.crc32, 'crc')
+        self.assertEqual(mdobj.size, 'size')
+        self.assertEqual(mdobj.stat, 'stt')

=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2010-04-27 16:32:20 +0000
+++ ubuntuone/syncdaemon/sync.py	2010-05-06 19:17:36 +0000
@@ -670,10 +670,22 @@
         """Starts the scan again on a dir."""
         self.m.lr.scan_dir(self.key['mdid'], self.key['path'], udfmode)
 
+    def reput_file_from_local(self, event, params, hash):
+        """Re put the file from its local state."""
+        local_hash = self.key['local_hash']
+        previous_hash = self.key['server_hash']
+        crc32 = self.key['crc32']
+        size = self.key['size']
+        share_id = self.key['share_id']
+        node_id = self.key['node_id']
+
+        self.m.action_q.upload(share_id, node_id, previous_hash, local_hash,
+                               crc32, size, self.key.open_file)
+
     def put_file(self, event, params, hash, crc32, size, stat):
-        """upload the file to the server."""
+        """Upload the file to the server."""
         previous_hash = self.key['server_hash']
-        self.key.set(local_hash=hash, stat=stat)
+        self.key.set(local_hash=hash, stat=stat, crc32=crc32, size=size)
         self.key.sync()
 
         self.m.action_q.upload(share_id=self.key['share_id'],
@@ -700,12 +712,12 @@
 
 
     def reput_file(self, event, param, hash, crc32, size, stat):
-        """put the file again."""
+        """Put the file again."""
         self.m.action_q.cancel_upload(share_id=self.key['share_id'],
                             node_id=self.key['node_id'])
         previous_hash = self.key['server_hash']
 
-        self.key.set(local_hash=hash, stat=stat)
+        self.key.set(local_hash=hash, stat=stat, crc32=crc32, size=size)
         self.key.sync()
         self.m.action_q.upload(share_id=self.key['share_id'],
             node_id=self.key['node_id'], previous_hash=previous_hash,

=== modified file 'ubuntuone/syncdaemon/u1fsfsm.ods'
Binary files ubuntuone/syncdaemon/u1fsfsm.ods	2010-04-22 21:14:56 +0000 and ubuntuone/syncdaemon/u1fsfsm.ods	2010-05-06 19:17:36 +0000 differ
=== modified file 'ubuntuone/syncdaemon/u1fsfsm.py'
--- ubuntuone/syncdaemon/u1fsfsm.py	2010-04-22 21:14:56 +0000
+++ ubuntuone/syncdaemon/u1fsfsm.py	2010-05-06 19:17:36 +0000
@@ -2445,9 +2445,9 @@
                               'STATE_OUT': {u'changed': u'*',
                                             u'has_metadata': u'*',
                                             u'is_directory': u'*'}},
-                             {'ACTION': u'CONFLICT',
-                              'ACTION_FUNC': u'nothing',
-                              'COMMENTS': u'',
+                             {'ACTION': u'aq.upload()',
+                              'ACTION_FUNC': u'reput_file_from_local',
+                              'COMMENTS': u'The upload was interrupted, just try it again. ',
                               'PARAMETERS': {u'hash_eq_local_hash': u'F',
                                              u'hash_eq_server_hash': u'T',
                                              u'not_authorized': u'NA',