Merge lp:~mikemc/ubuntuone-client/fix-dummy-sync-menu-again into lp:ubuntuone-client

[Mike McCracken]

- Sync up mac/win sync_menu dummy with linux implementation. (LP: #1067088)

- Sync up mac/win sync_menu dummy with linux implementation. (LP: #1067088)

[Brian Curtin (brian.curtin)]

review: Approve

[Roberto Alsina (ralsina)]

Looks good. The change in line 33 does nothing but yuck, was it ugly!

review: Approve

=== modified file 'tests/platform/sync_menu/test_common.py'
--- tests/platform/sync_menu/test_common.py	2012-09-26 18:32:31 +0000
+++ tests/platform/sync_menu/test_common.py	2012-10-15 21:24:28 +0000
@@ -47,3 +47,8 @@
         """Check that the dummy has the proper methods required by the API."""
         dummy = common.UbuntuOneSyncMenu(1, 2)
         self.assertIsInstance(dummy.update_transfers, Callable)
+
+    def test_dummy_has_sync_status_changed(self):
+        """Check that the dummy has the proper methods required by the API."""
+        dummy = common.UbuntuOneSyncMenu(1, 2)
+        self.assertIsInstance(dummy.sync_status_changed, Callable)

=== modified file 'ubuntuone/platform/sync_menu/common.py'
--- ubuntuone/platform/sync_menu/common.py	2012-09-26 18:32:31 +0000
+++ ubuntuone/platform/sync_menu/common.py	2012-10-15 21:24:28 +0000
@@ -36,3 +36,6 @@
 
     def update_transfers(self):
         """Do nothing."""
+
+    def sync_status_changed(self, status):
+        """Do nothing."""

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2012-10-11 14:37:35 +0000
+++ ubuntuone/status/aggregator.py	2012-10-15 21:24:28 +0000
@@ -176,7 +176,7 @@
 
     MESSAGE_ONE = None  # to be defined in child classes
     WEIGHT = 99
-    DO_NOT_INSTANCE = "Do not instance this class, only children."""
+    DO_NOT_INSTANCE = "Do not instance this class, only children."
 
     def __init__(self, **kwargs):
         """Initialize this instance."""