Merge lp:~nataliabidart/magicicada-client/fix-import-txsocketserver into lp:magicicada-client

[Natalia Bidart]

- Add try-except for devtools modules.

[Natalia Bidart (nataliabidart)]

Ran 2773 tests in 202.721s

PASSED (skips=43, successes=2730)

review: Approve

=== modified file 'tests/platform/credentials/test_linux.py'
--- tests/platform/credentials/test_linux.py	2015-09-17 02:20:40 +0000
+++ tests/platform/credentials/test_linux.py	2015-09-20 21:25:01 +0000
@@ -38,8 +38,11 @@
 
 from twisted.internet.defer import Deferred, inlineCallbacks
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.devtools.testcases import skipTest
-from ubuntuone.devtools.testcases.dbus import DBusTestCase
+try:
+    from ubuntuone.devtools.testcases import skipTest
+    from ubuntuone.devtools.testcases.dbus import DBusTestCase
+except ImportError:
+    from ubuntuone.devtools.testcase import DBusTestCase, skipTest
 
 from ubuntuone.platform.credentials import (
     CredentialsError,

=== modified file 'tests/platform/filesystem_notifications/test_fsevents_daemon.py'
--- tests/platform/filesystem_notifications/test_fsevents_daemon.py	2012-09-18 23:46:47 +0000
+++ tests/platform/filesystem_notifications/test_fsevents_daemon.py	2015-09-20 21:25:01 +0000
@@ -34,7 +34,13 @@
 
 from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone import fseventsd
-from ubuntuone.devtools.testcases.txsocketserver import TidyUnixServer
+try:
+    from ubuntuone.devtools.testcases import skipIf
+    from ubuntuone.devtools.testcases.txsocketserver import TidyUnixServer
+    TidyUnixServer = None
+except ImportError:
+    from ubuntuone.devtools.testcase import skipIf
+    TidyUnixServer = None
 from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
     fsevents_daemon,
 )
@@ -100,7 +106,7 @@
         self.called = []
 
     def loseConnection(self):
-        """"Lost the connection."""
+        """Lost the connection."""
         self.called.append('loseConnection')
 
 
@@ -460,6 +466,8 @@
         yield self.monitor.add_watch(dirpath)
         self.assertNotIn('add_path', self.protocol.called)
 
+    @skipIf(TidyUnixServer is None,
+            'Testcases from txsocketserver not availble.')
     @defer.inlineCallbacks
     def test_is_available_monitor_running(self):
         """Test the method when it is indeed running."""

=== modified file 'tests/platform/ipc/test_linux.py'
--- tests/platform/ipc/test_linux.py	2015-09-19 21:04:46 +0000
+++ tests/platform/ipc/test_linux.py	2015-09-20 21:25:01 +0000
@@ -33,7 +33,10 @@
 import dbus
 
 from twisted.internet import defer
-from ubuntuone.devtools.testcases.dbus import DBusTestCase
+try:
+    from ubuntuone.devtools.testcases.dbus import DBusTestCase
+except ImportError:
+    from ubuntuone.devtools.testcase import DBusTestCase
 
 from contrib.testing.testcase import (
     FakeMainTestCase,

=== modified file 'tests/platform/ipc/test_perspective_broker.py'
--- tests/platform/ipc/test_perspective_broker.py	2015-09-20 15:29:26 +0000
+++ tests/platform/ipc/test_perspective_broker.py	2015-09-20 21:25:01 +0000
@@ -45,11 +45,10 @@
     FakedService,
     FakeMainTestCase,
 )
-from ubuntuone.devtools.testcases import skipIfOS
-from ubuntuone.devtools.testcases.txsocketserver import (
-    TidyUnixServer,
-    TCPPbServerTestCase,
-)
+try:
+    from ubuntuone.devtools.testcases import skipTest, skipIf, skipIfOS
+except ImportError:
+    from ubuntuone.devtools.testcase import skipTest, skipIf, skipIfOS
 from ubuntuone.platform.ipc import perspective_broker as ipc
 from ubuntuone.platform.ipc.perspective_broker import (
     Config,
@@ -82,6 +81,19 @@
 except ImportError:
     from ubuntu_sso.networkstate import ONLINE
 
+
+class NoTestCase(object):
+    """Dummy class to be used when txsocketserver is not available."""
+
+try:
+    from ubuntuone.devtools.testcases.txsocketserver import (
+        TidyUnixServer,
+        TCPPbServerTestCase,
+    )
+except ImportError:
+    TidyUnixServer = None
+    TCPPbServerTestCase = NoTestCase
+
 TEST_PORT = 40404
 TEST_DOMAIN_SOCKET = os.path.join(basedir.xdg_cache_home, 'ubuntuone', 'ipc')
 
@@ -381,6 +393,8 @@
         self.assertEqual(fake_remote_object.called, expected)
 
 
+@skipIf(TCPPbServerTestCase is NoTestCase,
+        'Testcases from txsocketserver not availble.')
 class IPCTestCase(FakeMainTestCase, TCPPbServerTestCase):
     """Set the ipc to a random port for this instance."""
 
@@ -554,6 +568,7 @@
     client_class = StatusClient
 
 
+@skipIf(TidyUnixServer is None, 'Testcases from txsocketserver not availble.')
 @skipIfOS('win32', 'Unix domain sockets not supported on windows.')
 class DUSStatusTestCase(StatusTestCase):
     """Test the status client class."""
@@ -569,6 +584,7 @@
     client_class = EventsClient
 
 
+@skipIf(TidyUnixServer is None, 'Testcases from txsocketserver not availble.')
 @skipIfOS('win32', 'Unix domain sockets not supported on windows.')
 class DUSEventsTestCase(EventsTestCase):
     """Test the events client class."""
@@ -584,6 +600,7 @@
     client_class = SyncDaemonClient
 
 
+@skipIf(TidyUnixServer is None, 'Testcases from txsocketserver not availble.')
 @skipIfOS('win32', 'Unix domain sockets not supported on windows.')
 class DUSSyncDaemonTestCase(SyncDaemonTestCase):
     """Test the syncdaemon client class."""
@@ -599,6 +616,7 @@
     client_class = FileSystemClient
 
 
+@skipIf(TidyUnixServer is None, 'Testcases from txsocketserver not availble.')
 @skipIfOS('win32', 'Unix domain sockets not supported on windows.')
 class DUSFileSystemTestCase(FileSystemTestCase):
     """Test the file system client class."""
@@ -614,6 +632,7 @@
     client_class = SharesClient
 
 
+@skipIf(TidyUnixServer is None, 'Testcases from txsocketserver not availble.')
 @skipIfOS('win32', 'Unix domain sockets not supported on windows.')
 class DUSSharesTestCase(SharesTestCase):
     """Test the shares client class."""
@@ -629,6 +648,7 @@
     client_class = ConfigClient
 
 
+@skipIf(TidyUnixServer is None, 'Testcases from txsocketserver not availble.')
 @skipIfOS('win32', 'Unix domain sockets not supported on windows.')
 class DUSConfigTestCase(ConfigTestCase):
     """Test the status client class."""
@@ -644,6 +664,7 @@
     client_class = FoldersClient
 
 
+@skipIf(TidyUnixServer is None, 'Testcases from txsocketserver not availble.')
 @skipIfOS('win32', 'Unix domain sockets not supported on windows.')
 class DUSFoldersTestCase(FoldersTestCase):
     """Test the status client class."""
@@ -659,6 +680,7 @@
     client_class = PublicFilesClient
 
 
+@skipIf(TidyUnixServer is None, 'Testcases from txsocketserver not availble.')
 @skipIfOS('win32', 'Unix domain sockets not supported on windows.')
 class DUSPublicFilesTestCase(PublicFilesTestCase):
     """Test the status client class."""
@@ -786,6 +808,7 @@
         self.assertIsInstance(remote, RemoteReference)
 
 
+@skipIf(TidyUnixServer is None, 'Testcases from txsocketserver not availble.')
 @skipIfOS('win32', 'Unix domain sockets not supported on windows.')
 class DUSInterfaceTestCase(IPCInterfaceTestCase):
     """Ensure that the IPCInterface works as expected."""

=== modified file 'tests/platform/os_helper/test_os_helper.py'
--- tests/platform/os_helper/test_os_helper.py	2012-05-16 16:33:49 +0000
+++ tests/platform/os_helper/test_os_helper.py	2015-09-20 21:25:01 +0000
@@ -40,7 +40,6 @@
     BaseTwistedTestCase,
     skip_if_win32_and_uses_readonly,
 )
-from ubuntuone.devtools.testcases import skipIfJenkins
 from ubuntuone.platform import (
     access,
     allow_writes,
@@ -133,7 +132,6 @@
             os.mkdir(foo_dir)
             self.assertTrue(path_exists(foo_dir))
 
-    @skipIfJenkins("win32", "Fails due to Jenkins setup on Windows")
     def test_set_file_readonly(self):
         """Test for set_file_readonly."""
         set_file_readonly(self.testfile)

=== modified file 'tests/platform/session/test_linux.py'
--- tests/platform/session/test_linux.py	2012-06-26 15:02:12 +0000
+++ tests/platform/session/test_linux.py	2015-09-20 21:25:01 +0000
@@ -35,8 +35,10 @@
 
 from dbus.mainloop.glib import DBusGMainLoop
 from twisted.internet.defer import inlineCallbacks
-from ubuntuone.devtools.testcases.dbus import DBusTestCase
-
+try:
+    from ubuntuone.devtools.testcases.dbus import DBusTestCase
+except ImportError:
+    from ubuntuone.devtools.testcase import DBusTestCase
 from ubuntuone.platform import session
 
 INHIBIT_ALL = (session.INHIBIT_LOGGING_OUT |