Merge lp:~diegosarmentero/ubuntuone-client/fix-dummy into lp:ubuntuone-client

[Diego Sarmentero]

- Fixed dummy init (LP: #1053775).

[lp:~diegosarmentero/ubuntuone-client/fix-dummy]

1321. By Diego Sarmentero on 2012-09-21

fixing test case

[Natalia Bidart (nataliabidart)]

Looks great! Thanks

review: Approve

[dobey (dobey)]

Please chain the __init__ with super here properly so that object.__init__() is called, as well as on the UbuntuOneSyncMenuLinux class.

Also, please use assertNotRaises() to test instantiation of the object is working. To test that start_timer works properly, please add a second test to this test case which creates a dummy object, and then check that the start_timer attribute has a "__call__" attribute itself.

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-client/fix-dummy]

1322. By Diego Sarmentero on 2012-09-21

docstring updated

1323. By Diego Sarmentero on 2012-09-21

checking that dummy has start_timer and it is callable

1324. By Diego Sarmentero on 2012-09-21

using assertIsInstance

[dobey (dobey)]

Looks ok now.

review: Approve

=== modified file 'tests/platform/sync_menu/test_linux.py'
--- tests/platform/sync_menu/test_linux.py	2012-09-19 17:23:02 +0000
+++ tests/platform/sync_menu/test_linux.py	2012-09-21 14:11:21 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """Test the Sync Menu."""
 
+from collections import Callable
+
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
@@ -91,6 +93,20 @@
         self.data['connect'] = (signal, callback)
 
 
+class SyncMenuDummyTestCase(TestCase):
+    """Test the SyncMenu."""
+
+    def test_dummy_support(self):
+        """Check that the Dummy object can be created properly."""
+        dummy = linux.DummySyncMenu('random', 'args')
+        self.assertIsInstance(dummy, linux.DummySyncMenu)
+
+    def test_dummy_has_start_timer(self):
+        """Check that the dummy has the proper methods required by the API."""
+        dummy = linux.DummySyncMenu('random', 'args')
+        self.assertIsInstance(dummy.start_timer, Callable)
+
+
 class SyncMenuTestCase(TestCase):
     """Test the SyncMenu."""
 

=== modified file 'ubuntuone/platform/sync_menu/linux.py'
--- ubuntuone/platform/sync_menu/linux.py	2012-09-19 17:23:02 +0000
+++ ubuntuone/platform/sync_menu/linux.py	2012-09-21 14:11:21 +0000
@@ -222,6 +222,10 @@
 
 
 class DummySyncMenu(object):
+    """Dummy SyncMenu"""
+
+    def __init__(self, *args, **kwargs):
+        """Initialize menu."""
 
     def start_timer(self):
         """Do nothing."""