Merge lp:~verterok/ubuntuone-client/fix-674092 into lp:ubuntuone-client

[Guillermo Gonzalez]

This branch fix server rescan to also cleanup dead volumes after the actual volumes rescan.

This branch fix server rescan to also cleanup dead volumes after the actual volumes rescan.

[dobey (dobey)]

review: Approve

[John O'Brien (jdobrien)]

good to go!

review: Approve

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-11-15 12:58:38 +0000
+++ tests/syncdaemon/test_vm.py	2010-11-24 00:01:52 +0000
@@ -2321,6 +2321,83 @@
     test_refresh_shares_called_after_server_rescan.timeout  = 1
 
     @defer.inlineCallbacks
+    def test_server_rescan_clean_dead_udf(self):
+        """Test cleanup of dead volumes after server_rescan method."""
+        # the UDF part makes sense if UDF autosubscribe is True
+        user_conf = config.get_user_config()
+        user_conf.set_udf_autosubscribe(True)
+        share_id = uuid.uuid4()
+        share_volume = volumes.ShareVolume(share_id, 'fake_share_uuid', 1, 100,
+                                           'to_me', 'fake_share', 'username',
+                                           'visible_username', True, 'View')
+        udf_id = uuid.uuid4()
+        udf_volume = volumes.UDFVolume(udf_id, 'udf_node_id', 1, 200, u'~/UDF')
+        root_id = uuid.uuid4()
+        root_volume = volumes.RootVolume(root_id, 1, 500)
+        response = [share_volume, udf_volume, root_volume]
+
+        # patch fake action queue
+        self.main.action_q.query_volumes = lambda: defer.succeed(response)
+        server_rescan_d = defer.Deferred()
+        self._listen_for('SYS_SERVER_RESCAN_DONE', server_rescan_d.callback)
+        with environ('HOME', self.home_dir):
+            yield self.vm.server_rescan()
+        yield server_rescan_d
+        self.assertIn(request.ROOT, self.vm.shares)
+        self.assertIn(str(share_volume.volume_id), self.vm.shares)
+        self.assertEquals(1, len(self.vm.udfs))
+        self.assertEquals(2, len(self.vm.shares))
+        # remove the udf from the response list
+        response = [share_volume, root_volume]
+        server_rescan_d = defer.Deferred()
+        self._listen_for('SYS_SERVER_RESCAN_DONE', server_rescan_d.callback)
+        with environ('HOME', self.home_dir):
+            yield self.vm.server_rescan()
+        yield server_rescan_d
+        self.assertIn(request.ROOT, self.vm.shares)
+        self.assertIn(str(share_volume.volume_id), self.vm.shares)
+        self.assertEquals(0, len(self.vm.udfs))
+        self.assertEquals(2, len(self.vm.shares))
+
+    @defer.inlineCallbacks
+    def test_server_rescan_clean_dead_shares(self):
+        """Test cleanup of dead volumes after server_rescan method."""
+        # the UDF part makes sense if UDF autosubscribe is True
+        user_conf = config.get_user_config()
+        user_conf.set_udf_autosubscribe(True)
+        share_id = uuid.uuid4()
+        share_volume = volumes.ShareVolume(share_id, 'fake_share_uuid', 1, 100,
+                                           'to_me', 'fake_share', 'username',
+                                           'visible_username', True, 'View')
+        udf_id = uuid.uuid4()
+        udf_volume = volumes.UDFVolume(udf_id, 'udf_node_id', 1, 200, u'~/UDF')
+        root_id = uuid.uuid4()
+        root_volume = volumes.RootVolume(root_id, 1, 500)
+        response = [share_volume, udf_volume, root_volume]
+        # patch fake action queue
+        self.main.action_q.query_volumes = lambda: defer.succeed(response)
+        server_rescan_d = defer.Deferred()
+        self._listen_for('SYS_SERVER_RESCAN_DONE', server_rescan_d.callback)
+        with environ('HOME', self.home_dir):
+            yield self.vm.server_rescan()
+        yield server_rescan_d
+        self.assertIn(request.ROOT, self.vm.shares)
+        self.assertIn(str(udf_volume.volume_id), self.vm.udfs)
+        self.assertEquals(1, len(self.vm.udfs))
+        self.assertEquals(2, len(self.vm.shares))
+        # remove the share from the response list
+        response = [udf_volume, root_volume]
+        server_rescan_d = defer.Deferred()
+        self._listen_for('SYS_SERVER_RESCAN_DONE', server_rescan_d.callback)
+        with environ('HOME', self.home_dir):
+            yield self.vm.server_rescan()
+        yield server_rescan_d
+        self.assertIn(request.ROOT, self.vm.shares)
+        self.assertIn(str(udf_volume.volume_id), self.vm.udfs)
+        self.assertEquals(1, len(self.vm.udfs))
+        self.assertEquals(1, len(self.vm.shares))
+
+    @defer.inlineCallbacks
     def test_volumes_rescan_cb(self):
         """Test for _volumes_rescan_cb."""
         # the UDF part makes sense if UDF autosubscribe is True

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2010-11-12 22:01:23 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2010-11-24 00:01:52 +0000
@@ -481,6 +481,10 @@
         """Do the 'server rescan'"""
         d = self.m.action_q.query_volumes()
         d.addCallback(self._volumes_rescan_cb)
+        def cleanup(result):
+            shares, udfs = result
+            self._cleanup_volumes(shares=shares, udfs=udfs)
+        d.addCallbacks(cleanup)
         def done(_):
             self.m.event_q.push('SYS_SERVER_RESCAN_DONE')
         def error(failure):