Merge lp:~nataliabidart/ubuntuone-client/more-super-fixes into lp:ubuntuone-client

[Natalia Bidart]

- Windows tests do also need fix so super() is called (LP: #882446).

[Tim Cole (tcole)]

review: Approve

=== modified file 'tests/platform/windows/test_credentials.py'
--- tests/platform/windows/test_credentials.py	2011-09-13 19:31:23 +0000
+++ tests/platform/windows/test_credentials.py	2011-10-28 18:48:24 +0000
@@ -96,8 +96,9 @@
 class RemovableSignalTestCase(TestCase):
     """Tests for RemovableSignal."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Initialize this fake instance."""
+        yield super(RemovableSignalTestCase, self).setUp()
         self.proxy = FakeSSOProxy()
 
     def test_creation(self):
@@ -153,8 +154,9 @@
     timeout = 5
     app_name = APP_NAME
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Initialize these tests."""
+        yield super(CredentialsManagementTestCase, self).setUp()
         self._called = False
         self.proxy = FakeSSOProxy()
         self.cm = CredentialsManagement(self.proxy)

=== modified file 'tests/platform/windows/test_filesystem_notifications.py'
--- tests/platform/windows/test_filesystem_notifications.py	2011-10-18 13:27:44 +0000
+++ tests/platform/windows/test_filesystem_notifications.py	2011-10-28 18:48:24 +0000
@@ -107,9 +107,9 @@
 
     timeout = 5
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Set infor for the tests."""
-        super(TestWatch, self).setUp()
+        yield super(TestWatch, self).setUp()
         self.basedir = self.mktemp('test_root')
         self.mask = FILE_NOTIFY_CHANGE_FILE_NAME | \
             FILE_NOTIFY_CHANGE_DIR_NAME | \
@@ -834,9 +834,10 @@
 class TestWatchManager(BaseTwistedTestCase):
     """Test the watch manager."""
 
+    @defer.inlineCallbacks
     def setUp(self):
         """Set each of the tests."""
-        super(TestWatchManager, self).setUp()
+        yield super(TestWatchManager, self).setUp()
         self.parent_path = u'\\\\?\\C:\\'  # a valid windows path
         self.path = self.parent_path + u'path'
         self.watch = Watch(1, self.path, None, True, None)
@@ -1109,9 +1110,10 @@
 class TestNotifyProcessor(BaseTwistedTestCase):
     """Test the notify processor."""
 
+    @defer.inlineCallbacks
     def setUp(self):
         """set up the diffeent tests."""
-        super(TestNotifyProcessor, self).setUp()
+        yield super(TestNotifyProcessor, self).setUp()
         self.processor = NotifyProcessor(None)
         self.general = FakeGeneralProcessor()
         self.processor.general_processor = self.general

=== modified file 'tests/platform/windows/test_ipc.py'
--- tests/platform/windows/test_ipc.py	2011-09-06 20:04:55 +0000
+++ tests/platform/windows/test_ipc.py	2011-10-28 18:48:24 +0000
@@ -101,11 +101,30 @@
 class BaseIPCTestCase(TestCase):
     """Set the ipc to a random port for this instance."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Initialize this test instance."""
+        yield super(BaseIPCTestCase, self).setUp()
         self.patch(ipc, "get_sd_pb_port", lambda: TEST_PORT)
         self.patch(ipc, "ActivationClient", FakeActivationClient)
 
+    @defer.inlineCallbacks
+    def tearDown(self):
+        yield super(BaseIPCTestCase, self).tearDown()
+        if getattr(self, 'server_factory', None) is not None:
+            if self.server_factory.protocolInstance is not None:
+                self.server_factory.protocolInstance.transport.loseConnection()
+            yield defer.gatherResults([self._tearDownServer(),
+                                       self._tearDownClient()])
+
+    def _tearDownServer(self):
+        """Teardown the server."""
+        return defer.maybeDeferred(self.listener.stopListening)
+
+    def _tearDownClient(self):
+        """Tear down the client."""
+        self.connector.disconnect()
+        return defer.succeed(None)
+
 
 class SaveProtocolServerFactory(PBServerFactory):
     """A PBServerFactory that saves the latest connected client."""
@@ -144,9 +163,9 @@
 class SignalTestCase(MockerTestCase):
     """Test the signal decorator."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Set the tests."""
-        super(SignalTestCase, self).setUp()
+        yield super(SignalTestCase, self).setUp()
         self.fake_object = FakeDecoratedObject()
         self.cb = self.mocker.mock()
 
@@ -214,9 +233,9 @@
 class PerspectiveBrokerTestCase(TestCase):
     """Base test case for the IPC used on Windows."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(PerspectiveBrokerTestCase, self).setUp()
+        yield super(PerspectiveBrokerTestCase, self).setUp()
         self.config = Config(None, None)
         self.status = Status(None, None, None)
         self.events = Events(None)
@@ -278,8 +297,9 @@
 class TestSignalBroadcaster(MockerTestCase):
     """Test the signal broadcaster code."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        super(TestSignalBroadcaster, self).setUp()
+        yield super(TestSignalBroadcaster, self).setUp()
         self.client = self.mocker.mock()
         self.broad_caster = SignalBroadcaster()
 
@@ -434,9 +454,9 @@
 class TestStatusEmitSignals(PerspectiveBrokerTestCase, MockerTestCase):
     """Tests that the emit methods are correct."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestStatusEmitSignals, self).setUp()
+        yield super(TestStatusEmitSignals, self).setUp()
         self.signal_method = self.mocker.mock()
         self.status.syncdaemon_status = self.mocker.mock()
         self.status.emit_signal = self.signal_method
@@ -542,9 +562,9 @@
 class TestEventsEmitSignals(PerspectiveBrokerTestCase, MockerTestCase):
     """Test that the emit method have been correctly implemented."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestEventsEmitSignals, self).setUp()
+        yield super(TestEventsEmitSignals, self).setUp()
         self.signal_method = self.mocker.mock()
         self.events.emit_signal = self.signal_method
 
@@ -562,9 +582,9 @@
 class TestSyncDaemonEmitSignals(PerspectiveBrokerTestCase, MockerTestCase):
     """Test that the emit method have been correctly implemented."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestSyncDaemonEmitSignals, self).setUp()
+        yield super(TestSyncDaemonEmitSignals, self).setUp()
         self.signal_method = self.mocker.mock()
         self.sync.emit_signal = self.signal_method
 
@@ -587,9 +607,9 @@
 class TestSharesEmitSignals(PerspectiveBrokerTestCase, MockerTestCase):
     """Test that the emit method have been correctly implemented."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""   
-        super(TestSharesEmitSignals, self).setUp()
+        yield super(TestSharesEmitSignals, self).setUp()
         self.signal_method = self.mocker.mock()
         self.shares.emit_signal = self.signal_method
         self.shares.syncdaemon_shares = self.mocker.mock()
@@ -727,9 +747,9 @@
 class TestFoldersEmitSignals(PerspectiveBrokerTestCase, MockerTestCase):
     """Test that the emit method have been correctly implemented."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestFoldersEmitSignals, self).setUp()
+        yield super(TestFoldersEmitSignals, self).setUp()
         self.signal_method = self.mocker.mock()
         self.folders.emit_signal = self.signal_method
         self.get_udf_dict = self.mocker.replace(
@@ -798,9 +818,9 @@
 class TestPublicFilesEmitSignals(PerspectiveBrokerTestCase, MockerTestCase):
     """Test that the emit method have been correctly implemented."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestPublicFilesEmitSignals, self).setUp()
+        yield super(TestPublicFilesEmitSignals, self).setUp()
         self.signal_method = self.mocker.mock()
         self.public_files.emit_signal = self.signal_method
         self.public_files.syncdaemon_public_files = self.mocker.mock()
@@ -887,8 +907,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestStatusClient, self).setUp()
+        yield super(TestStatusClient, self).setUp()
         self.mocker = Mocker()
         self.root = self.mocker.mock()
         self.status = Status(None, None, None)
@@ -901,22 +920,6 @@
         self.client_factory = PBClientFactory()
         self.connector = yield ipc_client_connect(self.client_factory)
 
-    def tearDown(self):
-        """Clean reactor."""
-        if self.server_factory.protocolInstance is not None:
-            self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
-
-    def _tearDownServer(self):
-        """Teardown the server."""
-        return defer.maybeDeferred(self.listener.stopListening)
-
-    def _tearDownClient(self):
-        """Tear down the client."""
-        self.connector.disconnect()
-        return defer.succeed(None)
-
     @defer.inlineCallbacks
     def _get_client(self):
         """Get the client."""
@@ -1285,8 +1288,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestEventsClient, self).setUp()
+        yield super(TestEventsClient, self).setUp()
         self.mocker = Mocker()
         self.root = self.mocker.mock()
         self.events = Events(None)
@@ -1299,22 +1301,6 @@
         self.client_factory = PBClientFactory()
         self.connector = yield ipc_client_connect(self.client_factory)
 
-    def tearDown(self):
-        """Clean reactor."""
-        if self.server_factory.protocolInstance is not None:
-            self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
-
-    def _tearDownServer(self):
-        """Teardown the server."""
-        return defer.maybeDeferred(self.listener.stopListening)
-
-    def _tearDownClient(self):
-        """Tear down the client."""
-        self.connector.disconnect()
-        return defer.succeed(None)
-
     @defer.inlineCallbacks
     def _get_client(self):
         """Get the client."""
@@ -1372,8 +1358,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestSyncDaemonClient, self).setUp()
+        yield super(TestSyncDaemonClient, self).setUp()
         self.mocker = Mocker()
         self.root = self.mocker.mock()
         self.daemon = SyncDaemon(None, None, None, None)
@@ -1386,22 +1371,6 @@
         self.client_factory = PBClientFactory()
         self.connector = yield ipc_client_connect(self.client_factory)
 
-    def tearDown(self):
-        """Clean reactor."""
-        if self.server_factory.protocolInstance is not None:
-            self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
-
-    def _tearDownServer(self):
-        """Teardown the server."""
-        return defer.maybeDeferred(self.listener.stopListening)
-
-    def _tearDownClient(self):
-        """Tear down the client."""
-        self.connector.disconnect()
-        return defer.succeed(None)
-
     @defer.inlineCallbacks
     def _get_client(self):
         """Get the client."""
@@ -1612,8 +1581,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestFileSystemClient, self).setUp()
+        yield super(TestFileSystemClient, self).setUp()
         self.mocker = Mocker()
         self.root = self.mocker.mock()
         self.fs = FileSystem(None, None)
@@ -1626,22 +1594,6 @@
         self.client_factory = PBClientFactory()
         self.connector = yield ipc_client_connect(self.client_factory)
 
-    def tearDown(self):
-        """Clean reactor."""
-        if self.server_factory.protocolInstance is not None:
-            self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
-
-    def _tearDownServer(self):
-        """Teardown the server."""
-        return defer.maybeDeferred(self.listener.stopListening)
-
-    def _tearDownClient(self):
-        """Tear down the client."""
-        self.connector.disconnect()
-        return defer.succeed(None)
-
     @defer.inlineCallbacks
     def _get_client(self):
         """Get the client."""
@@ -1728,8 +1680,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestSyncDaemonClient, self).setUp()
+        yield super(TestSyncDaemonClient, self).setUp()
         self.mocker = Mocker()
         self.root = self.mocker.mock()
         self.get_share_dict = self.mocker.replace(
@@ -1744,17 +1695,6 @@
         self.client_factory = PBClientFactory()
         self.connector = yield ipc_client_connect(self.client_factory)
 
-    def tearDown(self):
-        """Clean reactor."""
-        if self.server_factory.protocolInstance is not None:
-            self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
-
-    def _tearDownServer(self):
-        """Teardown the server."""
-        return defer.maybeDeferred(self.listener.stopListening)
-
     def _tearDownClient(self):
         """Tear down the client."""
         self.connector.disconnect()
@@ -2219,8 +2159,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestConfigClient, self).setUp()
+        yield super(TestConfigClient, self).setUp()
         self.mocker = Mocker()
         self.root = self.mocker.mock()
         self.config = Config(None, None)
@@ -2233,22 +2172,6 @@
         self.client_factory = PBClientFactory()
         self.connector = yield ipc_client_connect(self.client_factory)
 
-    def tearDown(self):
-        """Clean reactor."""
-        if self.server_factory.protocolInstance is not None:
-            self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
-
-    def _tearDownServer(self):
-        """Teardown the server."""
-        return defer.maybeDeferred(self.listener.stopListening)
-
-    def _tearDownClient(self):
-        """Tear down the client."""
-        self.connector.disconnect()
-        return defer.succeed(None)
-
     @defer.inlineCallbacks
     def _get_client(self):
         """Get the client."""
@@ -2593,8 +2516,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestFoldersClient, self).setUp()
+        yield super(TestFoldersClient, self).setUp()
         self.mocker = Mocker()
         self.root = self.mocker.mock()
         self.folders = Folders(None, None)
@@ -2607,22 +2529,6 @@
         self.client_factory = PBClientFactory()
         self.connector = yield ipc_client_connect(self.client_factory)
 
-    def tearDown(self):
-        """Clean reactor."""
-        if self.server_factory.protocolInstance is not None:
-            self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
-
-    def _tearDownServer(self):
-        """Teardown the server."""
-        return defer.maybeDeferred(self.listener.stopListening)
-
-    def _tearDownClient(self):
-        """Tear down the client."""
-        self.connector.disconnect()
-        return defer.succeed(None)
-
     @defer.inlineCallbacks
     def _get_client(self):
         """Get the client."""
@@ -2952,8 +2858,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestPublicFilesClient, self).setUp()
+        yield super(TestPublicFilesClient, self).setUp()
         self.mocker = Mocker()
         self.root = self.mocker.mock()
         self.files = PublicFiles(None, None)
@@ -2966,22 +2871,6 @@
         self.client_factory = PBClientFactory()
         self.connector = yield ipc_client_connect(self.client_factory)
 
-    def tearDown(self):
-        """Clean reactor."""
-        if self.server_factory.protocolInstance is not None:
-            self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
-
-    def _tearDownServer(self):
-        """Teardown the server."""
-        return defer.maybeDeferred(self.listener.stopListening)
-
-    def _tearDownClient(self):
-        """Tear down the client."""
-        self.connector.disconnect()
-        return defer.succeed(None)
-
     @defer.inlineCallbacks
     def _get_client(self):
         """Get the client."""
@@ -3132,9 +3021,9 @@
 class TestAllEventsSender(MockerTestCase):
     """Test the status client class."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Setup tests."""
-        super(TestAllEventsSender, self).setUp()
+        yield super(TestAllEventsSender, self).setUp()
         self.events = self.mocker.mock()
         self.sender = AllEventsSender(self.events)
 
@@ -3195,7 +3084,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        super(TestIPCRoot, self).setUp()
+        yield super(TestIPCRoot, self).setUp()
         self.mocker = Mocker()
         self.main = self.mocker.mock()
         # diff objects that will be exposed by root
@@ -3211,22 +3100,6 @@
         self.connector = yield ipc_client_connect(self.client_factory)
         self.mocker.reset()
 
-    def tearDown(self):
-        """Clean reactor."""
-        if self.server_factory.protocolInstance is not None:
-            self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
-
-    def _tearDownServer(self):
-        """Teardown the server."""
-        return defer.maybeDeferred(self.listener.stopListening)
-
-    def _tearDownClient(self):
-        """Tear down the client."""
-        self.connector.disconnect()
-        return defer.succeed(None)
-
     @defer.inlineCallbacks
     def _get_client(self):
         """Get the client."""
@@ -3459,8 +3332,9 @@
 
     cmt_class = None
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Initialize this test instance."""
+        yield super(IPCInterfaceTestCaseBase, self).setUp()
         if self.cmt_class is None: return
         self.patch(ipc, "CredentialsManagementTool", self.cmt_class)
         self.patch(ipc, "IPCRoot", FakeIPCRoot)

=== modified file 'tests/platform/windows/test_network_manager.py'
--- tests/platform/windows/test_network_manager.py	2011-02-23 00:21:54 +0000
+++ tests/platform/windows/test_network_manager.py	2011-10-28 18:48:24 +0000
@@ -15,10 +15,14 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """Tests for the network manager."""
+
 from mocker import MockerTestCase
+
 from ubuntuone.platform.windows.network_manager import NetworkManager
 
+
 class TestNetworkManager(MockerTestCase):
     """Test he Network Manager."""
 

=== modified file 'tests/platform/windows/test_pyinotify.py'
--- tests/platform/windows/test_pyinotify.py	2011-07-05 11:24:00 +0000
+++ tests/platform/windows/test_pyinotify.py	2011-10-28 18:48:24 +0000
@@ -17,6 +17,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Test for the pyinotify implementation on windows."""
 
+from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
 from ubuntuone.platform.windows.pyinotify import RawOutputFormat
@@ -24,8 +25,9 @@
 class RawOutputFormatTest(TestCase):
     """Test te formatter to ensure it can deal with mbcs."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Set tests."""
+        yield super(RawOutputFormatTest, self).setUp()
         self.format = {'normal': 'normal'}
         self.formatter = RawOutputFormat(self.format)
 

=== modified file 'tests/platform/windows/test_tools.py'
--- tests/platform/windows/test_tools.py	2011-07-28 13:57:56 +0000
+++ tests/platform/windows/test_tools.py	2011-10-28 18:48:24 +0000
@@ -107,9 +107,9 @@
 class TestSyncDaemonTool(TestCase):
     """Various utility methods to test/play with the SyncDaemon."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Set up the different tests."""
-        super(TestSyncDaemonTool, self).setUp()
+        yield super(TestSyncDaemonTool, self).setUp()
         self.mocker = Mocker()
         self.root = self.mocker.mock()
         self.status = Status(None, None, None)
@@ -142,12 +142,13 @@
         self.listener = ipc_server_listen(self.server_factory)
         self.sdtool = SyncDaemonTool()
 
+    @defer.inlineCallbacks
     def tearDown(self):
-        """Clean reactor."""
+        yield super(TestSyncDaemonTool, self).tearDown()
         if self.server_factory.protocolInstance is not None:
             self.server_factory.protocolInstance.transport.loseConnection()
-        return defer.gatherResults([self._tearDownServer(),
-                                    self._tearDownClient()])
+        yield defer.gatherResults([self._tearDownServer(),
+                                   self._tearDownClient()])
 
     def _tearDownServer(self):
         """Teardown the server."""