Merge lp:~facundo/magicicada-gui/update-folder-list-after-changes into lp:magicicada-gui

[Facundo Batista]

- Update folders list after a successful operation (LP: #899307).

Update folders list after a successful operation.

Test included.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Natalia Bidart (nataliabidart)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Natalia Bidart (nataliabidart)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'magicicada/syncdaemon.py'
--- magicicada/syncdaemon.py	2011-12-05 23:52:43 +0000
+++ magicicada/syncdaemon.py	2011-12-06 01:51:26 +0000
@@ -506,6 +506,7 @@
             vol = result.volume
             path = result.path
             logger.info("%s folder ok: volume=%s path=%r", op_name, vol, path)
+            self.folders = yield self.dbus.get_folders()
 
     def create_folder(self, path):
         """Create a folder."""

=== modified file 'magicicada/tests/test_syncdaemon.py'
--- magicicada/tests/test_syncdaemon.py	2011-12-05 23:52:43 +0000
+++ magicicada/tests/test_syncdaemon.py	2011-12-06 01:51:26 +0000
@@ -1016,11 +1016,14 @@
                        suggested_path='sug_path')
         self.sd.dbus.fake_folder_response = defer.succeed(folder_data)
         self.sd.on_folder_op_error_callback = lambda *a: None
+        self.sd.dbus.get_folders = lambda: defer.succeed([folder_data])
+        assert not self.sd.folders
 
         # execute and test
         yield self.sd.create_folder('path')
         self.assertTrue(self.hdlr.check_info("Create folder ok", "path='path'",
                                                 "volume=vol_id"))
+        self.assertEqual(self.sd.folders, [folder_data])
 
     @defer.inlineCallbacks
     def test_create_folder_failure(self):
@@ -1044,11 +1047,14 @@
                        suggested_path='sug_path')
         self.sd.dbus.fake_folder_response = defer.succeed(folder_data)
         self.sd.on_folder_op_error_callback = lambda *a: None
+        self.sd.dbus.get_folders = lambda: defer.succeed([])
+        self.sd.folders = 'stuff'
 
         # execute and test
         yield self.sd.delete_folder('vol_id')
         self.assertTrue(self.hdlr.check_info("Delete folder ok", "path='path'",
                                                 "volume=vol_id"))
+        self.assertEqual(self.sd.folders, [])
 
     @defer.inlineCallbacks
     def test_delete_folder_failure(self):
@@ -1072,11 +1078,14 @@
                        suggested_path='sug_path')
         self.sd.dbus.fake_folder_response = defer.succeed(folder_data)
         self.sd.on_folder_op_error_callback = lambda *a: None
+        self.sd.dbus.get_folders = lambda: defer.succeed([folder_data])
+        self.sd.folders = 'stuff'
 
         # execute and test
         yield self.sd.subscribe_folder('vol_id')
         self.assertTrue(self.hdlr.check_info("Subscribe folder ok",
                                              "path='path'", "volume=vol_id"))
+        self.assertEqual(self.sd.folders, [folder_data])
 
     @defer.inlineCallbacks
     def test_subscribe_folder_failure(self):
@@ -1100,11 +1109,14 @@
                        suggested_path='sug_path')
         self.sd.dbus.fake_folder_response = defer.succeed(folder_data)
         self.sd.on_folder_op_error_callback = lambda *a: None
+        self.sd.dbus.get_folders = lambda: defer.succeed([folder_data])
+        self.sd.folders = 'stuff'
 
         # execute and test
         yield self.sd.unsubscribe_folder('vol_id')
         self.assertTrue(self.hdlr.check_info("Unsubscribe folder ok",
                                              "path='path'", "volume=vol_id"))
+        self.assertEqual(self.sd.folders, [folder_data])
 
     @defer.inlineCallbacks
     def test_unsubscribe_folder_failure(self):