Merge lp:~alecu/ubuntuone-client/fix-credentials-defer into lp:ubuntuone-client

[Alejandro J. Cura]

The returned credentials proxy may be a deferred (LP: #799827)

The returned credentials proxy may be a deferred (LP: #799827)

[Natalia Bidart (nataliabidart)]

Very good!

review: Approve

[Manuel de la Peña (mandel)]

Superb!

review: Approve

=== modified file 'tests/test_credentials.py'
--- tests/test_credentials.py	2011-04-05 15:30:40 +0000
+++ tests/test_credentials.py	2011-06-20 20:24:49 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Manuel de la Pena<[e-mail]>
+# Authors: Manuel de la Pena <[e-mail]>
+#          Alejandro J. Cura <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -18,12 +19,13 @@
 """Platform independent tests for the credentials management."""
 
 from mocker import MockerTestCase, MATCH
+from twisted.internet import defer
 
 from ubuntuone.platform.credentials import CredentialsManagementTool
 
 
 class TestCredentialsManagementTool(MockerTestCase):
-    """Test the crendentials management tool mocking the proxy."""
+    """Test the credentials management tool mocking the proxy."""
 
     def setUp(self):
         """Set the diff tests."""
@@ -96,3 +98,14 @@
         self.mocker.replay()
         return self.management_tool.register(window_id=window_id)
 
+
+class TestDeferredCredentialsManagementTool(TestCredentialsManagementTool):
+    """Test the credentials management tool mocking the proxy in a deferred."""
+
+    def setUp(self):
+        """Set the diff tests."""
+        super(TestDeferredCredentialsManagementTool, self).setUp()
+        real_get_cred_proxy = self.mocker.mock()
+        self.get_cred_proxy = lambda: defer.succeed(real_get_cred_proxy())
+        self.management_tool = CredentialsManagementTool()
+        self.management_tool.get_creds_proxy = self.get_cred_proxy
 
=== modified file 'ubuntuone/credentials.py'
--- ubuntuone/credentials.py	2011-04-05 15:30:40 +0000
+++ ubuntuone/credentials.py	2011-06-20 20:24:49 +0000
@@ -60,7 +60,7 @@
 
     def __init__(self, get_proxy_fn):
         self._cleanup_signals = []
-        self.get_creds_proxy = get_proxy_fn
+        self.get_proxy_fn = get_proxy_fn
 
     def cleanup(self, _):
         """Disconnect all the DBus signals."""
@@ -70,6 +70,10 @@
 
         return _
 
+    def get_creds_proxy(self):
+        """Call the get_proxy_fn, and perhaps wrap the result in a defer."""
+        return defer.maybeDeferred(self.get_proxy_fn)
+
     @defer.inlineCallbacks
     def find_credentials(self):
         """Find credentials for Ubuntu One.
@@ -91,7 +95,7 @@
         d = defer.Deferred()
         d.addBoth(self.cleanup)
 
-        proxy = self.get_creds_proxy()
+        proxy = yield self.get_creds_proxy()
 
         sig = proxy.register_to_credentials_found(d.callback)
         self._cleanup_signals.append(sig)
@@ -124,7 +128,7 @@
         d = defer.Deferred()
         d.addBoth(self.cleanup)
 
-        proxy = self.get_creds_proxy()
+        proxy = yield self.get_creds_proxy()
         sig = proxy.register_to_credentials_cleared(lambda: d.callback(None))
         self._cleanup_signals.append(sig)
 
@@ -155,7 +159,7 @@
         d = defer.Deferred()
         d.addBoth(self.cleanup)
 
-        proxy = self.get_creds_proxy()
+        proxy = yield self.get_creds_proxy()
         sig = proxy.register_to_credentials_stored(lambda: d.callback(None))
         self._cleanup_signals.append(sig)
 
@@ -195,7 +199,7 @@
         d = defer.Deferred()
         d.addBoth(self.cleanup)
 
-        proxy = self.get_creds_proxy()
+        proxy = yield self.get_creds_proxy()
 
         sig = proxy.register_to_credentials_found(d.callback)
         self._cleanup_signals.append(sig)
@@ -241,7 +245,7 @@
         d = defer.Deferred()
         d.addBoth(self.cleanup)
 
-        proxy = self.get_creds_proxy()
+        proxy = yield self.get_creds_proxy()
 
         sig = proxy.register_to_credentials_found(d.callback)
         self._cleanup_signals.append(sig)