Merge lp:~facundo/magicicada-gui/update-status into lp:magicicada-gui

[Facundo Batista]

Set status when name owner changes.

[Natalia Bidart (nataliabidart)]

Very nice.

review: Approve

=== modified file 'magicicada/syncdaemon.py'
--- magicicada/syncdaemon.py	2010-05-27 12:45:13 +0000
+++ magicicada/syncdaemon.py	2010-05-28 02:13:24 +0000
@@ -145,10 +145,20 @@
         """SyncDaemon name owner changed."""
         logger.info("SD Name Owner changed: %s", now_active)
         self.current_state._set(is_started=now_active)
+
+        def set_status(name, description):
+            """Set status after the name owner change."""
+            d = dict(name=name, description=description, is_error=False,
+                     is_connected=False, is_online=False, queues='',
+                     connection='')
+            self.current_state._set(**d)
+
         if now_active:
+            set_status('STARTED', 'ubuntuone-client just started')
             self.on_started_callback()
             self._get_initial_data()
         else:
+            set_status('STOPPED', 'ubuntuone-client is stopped')
             self.on_stopped_callback()
 
     def on_sd_status_changed(self, *status_data):

=== modified file 'magicicada/tests/test_syncdaemon.py'
--- magicicada/tests/test_syncdaemon.py	2010-05-27 12:45:13 +0000
+++ magicicada/tests/test_syncdaemon.py	2010-05-28 02:13:24 +0000
@@ -189,6 +189,33 @@
         self.assertEqual(self.sd.current_state.queues, 'queues2')
         self.assertEqual(self.sd.current_state.connection, 'connection2')
 
+    def test_on_stopped(self):
+        """Stopped affects the status."""
+        self.sd.on_sd_name_owner_changed(False)
+        self.assertEqual(self.sd.current_state.name, 'STOPPED')
+        self.assertEqual(self.sd.current_state.description,
+                         'ubuntuone-client is stopped')
+        self.assertEqual(self.sd.current_state.is_error, False)
+        self.assertEqual(self.sd.current_state.is_connected, False)
+        self.assertEqual(self.sd.current_state.is_online, False)
+        self.assertEqual(self.sd.current_state.queues, '')
+        self.assertEqual(self.sd.current_state.connection, '')
+
+    def test_on_started(self):
+        """Started affects the status."""
+        # make _get_initial_data dummy to not affect test
+        self.sd._get_initial_data = lambda: None
+
+        self.sd.on_sd_name_owner_changed(True)
+        self.assertEqual(self.sd.current_state.name, 'STARTED')
+        self.assertEqual(self.sd.current_state.description,
+                         'ubuntuone-client just started')
+        self.assertEqual(self.sd.current_state.is_error, False)
+        self.assertEqual(self.sd.current_state.is_connected, False)
+        self.assertEqual(self.sd.current_state.is_online, False)
+        self.assertEqual(self.sd.current_state.queues, '')
+        self.assertEqual(self.sd.current_state.connection, '')
+
 
 class ContentQueueChangedTests(BaseTest):
     """Check the ContenQueueChanged handling."""