Merge lp:~mikemc/ubuntuone-client/fix-networkstate-manythreads into lp:ubuntuone-client

[Mike McCracken]

- Mock out NetworkState in IPCTestCase, avoids starting a thread per test case on darwin and windows.

- Mock out NetworkState in IPCTestCase, avoids starting a thread per test case on darwin and windows.

Since IPCTestCase subclasses do not test network state handling, a simple mock that always returns ONLINE works fine, and avoids starting a ton of threads that never exit.

This appears to be more of a problem on darwin than on windows, but it can't hurt.

[dobey (dobey)]

review: Approve

=== modified file 'tests/platform/ipc/test_perspective_broker.py'
--- tests/platform/ipc/test_perspective_broker.py	2012-09-06 22:17:45 +0000
+++ tests/platform/ipc/test_perspective_broker.py	2013-01-08 16:55:32 +0000
@@ -78,6 +78,7 @@
 )
 from ubuntuone.syncdaemon import interaction_interfaces
 
+from ubuntu_sso.networkstate.networkstates import ONLINE
 
 TEST_PORT = 40404
 TEST_DOMAIN_SOCKET = os.path.join(basedir.xdg_cache_home, 'ubuntuone', 'ipc')
@@ -351,6 +352,18 @@
         self.called.append(args)
 
 
+class FakeNetworkManagerState(object):
+    """Fake NetworkState."""
+
+    def __init__(self, result_cb=None):
+        """Just save callback."""
+        self.cb = result_cb
+
+    def find_online_state(self):
+        """Always say ONLINE."""
+        self.cb(ONLINE)
+
+
 class RemoteClientTestCase(TestCase):
     """Tests for the RemoteClient class."""
 
@@ -381,7 +394,8 @@
         self.patch(ipc, 'ActivationClient', FakeActivationClient)
         # patch the interaction interfaces to not choose the system one but
         # always the perspective broker one
-        self.patch(interaction_interfaces, 'ExternalInterface', ipc.IPCInterface)
+        self.patch(interaction_interfaces, 'ExternalInterface',
+                   ipc.IPCInterface)
 
         yield super(IPCTestCase, self).setUp()
 
@@ -399,6 +413,11 @@
 
         self.bus = None  # parity with linux code
 
+        # patch the networkmanagerstate to avoid spawning unnecessary
+        # threads when we instantiate the syncdaemonservice:
+        self.patch(interaction_interfaces, 'NetworkManagerState',
+                   FakeNetworkManagerState)
+
         self.service = self.service_class(main=self.main, send_events=True)
         self.service.oauth_credentials = ('foo', 'bar')
 
@@ -517,7 +536,7 @@
             setattr(remote_client, remote_cb_name, fake_remote_cb)
             self.addCleanup(delattr, remote_client, remote_cb_name)
 
-            remote_client_func = getattr(remote_client, 
+            remote_client_func = getattr(remote_client,
                                          remote_client_func_name)
 
             result = remote_client_func(*args)