Merge lp:~dobey/ubuntuone-client/sdtool-q-3-0 into lp:ubuntuone-client/stable-3-0

[dobey]

- Avoid creating SyncDaemonTool if is not already running and the user wants to close it. (LP: #907479).

[Eric Casteleijn (thisfred)]

review: Approve

=== modified file 'tests/platform/windows/test_tools.py'
--- tests/platform/windows/test_tools.py	2012-04-09 20:07:05 +0000
+++ tests/platform/windows/test_tools.py	2012-04-24 20:51:20 +0000
@@ -29,6 +29,7 @@
 """Tests for some tools for talking to the syncdaemon."""
 
 import sys
+import operator
 
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
@@ -50,6 +51,7 @@
         yield super(TestSyncDaemonTool, self).setUp()
         self.patch(windows.UbuntuOneClient, "connect", lambda _: defer.Deferred())
         self.sdtool = windows.SyncDaemonToolProxy()
+        self.calls = {}
 
     def test_call_after_connection(self):
         """Test the _call_after_connection method."""
@@ -61,6 +63,31 @@
         self.sdtool.connected.callback("got connected!")
         self.assertEqual(len(collected_calls), 1)
 
+    def test_call_after_connection_connect(self):
+        """Test execute connect in _call_after_connection method."""
+        self.patch(self.sdtool.client, "is_connected", lambda: False)
+        my_connect = lambda *args, **kwargs: operator.setitem(
+                self.calls, "connect", (args, kwargs))
+        self.patch(self.sdtool.client, "connect", my_connect)
+        collected_calls = []
+        test_method = lambda *args: collected_calls.append(args)
+        test_method = self.sdtool._call_after_connection(test_method)
+        test_method(123)
+        self.assertIn("connect", self.calls)
+        self.assertEqual(self.calls["connect"], ((), {}))
+
+    def test_call_after_connection_not_connect(self):
+        """Test execute connect in _call_after_connection method."""
+        self.patch(self.sdtool.client, "is_connected", lambda: True)
+        my_connect = lambda *args, **kwargs: operator.setitem(
+                self.calls, "connect", (args, kwargs))
+        self.patch(self.sdtool.client, "connect", my_connect)
+        collected_calls = []
+        test_method = lambda *args: collected_calls.append(args)
+        test_method = self.sdtool._call_after_connection(test_method)
+        test_method(123)
+        self.assertNotIn("connect", self.calls)
+
     def test_should_wrap(self):
         """Only some attributes should be wrapped."""
         test_function = "sample_function"

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2012-04-24 18:56:40 +0000
+++ tests/syncdaemon/test_action_queue.py	2012-04-24 20:51:20 +0000
@@ -1309,6 +1309,7 @@
         orig = self.action_queue.clientConnectionLost
 
         d = defer.Deferred()
+
         def faked_connectionLost(*args, **kwargs):
             """Receive connection lost and check."""
             orig(*args, **kwargs)

=== modified file 'ubuntuone/platform/tools/windows.py'
--- ubuntuone/platform/tools/windows.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/tools/windows.py	2012-04-24 20:51:20 +0000
@@ -126,10 +126,12 @@
 
     def __init__(self, bus=None):
         self.client = UbuntuOneClient()
-        self.connected = self.client.connect()
+        self.connected = None
 
     def _call_after_connection(self, method):
         """Make sure Perspective Broker is connected before calling."""
+        if not self.client.is_connected():
+            self.connected = self.client.connect()
 
         @defer.inlineCallbacks
         def call_after_connection_inner(*args, **kwargs):

=== modified file 'ubuntuone/platform/windows/ipc_client.py'
--- ubuntuone/platform/windows/ipc_client.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/windows/ipc_client.py	2012-04-24 20:51:20 +0000
@@ -759,6 +759,10 @@
                             'Could not connect to the syncdaemon ipc.', e)
         # pylint: disable=W0702
 
+    def is_connected(self):
+        """Return if the client is connected."""
+        return (self.client is not None)
+
     @defer.inlineCallbacks
     def register_to_signals(self):
         """Register the different clients to the signals."""