Merge lp:~nataliabidart/ubuntuone-client/login-not-register into lp:ubuntuone-client

[Natalia Bidart]

- Call CredentialsManagementTool.login when prompt to connect (LP: #944230).

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'tests/syncdaemon/test_interaction_interfaces.py'
--- tests/syncdaemon/test_interaction_interfaces.py	2012-02-18 16:13:04 +0000
+++ tests/syncdaemon/test_interaction_interfaces.py	2012-03-01 19:29:03 +0000
@@ -84,11 +84,11 @@
         self._kwargs = kwargs
         self._called = {}
 
-    def register(self, *args, **kwargs):
-        """Fake register."""
+    def login(self, *args, **kwargs):
+        """Fake login."""
         if self.should_fail:
             return defer.fail(self.should_fail)
-        self._called['register'] = (args, kwargs)
+        self._called['login'] = (args, kwargs)
         return defer.succeed(self.credentials)
 
     def find_credentials(self, *args, **kwargs):
@@ -2291,7 +2291,7 @@
     """
 
     sd_class = SyncdaemonService
-    method = 'register'
+    method = 'login'
     autoconnecting = False
 
     @defer.inlineCallbacks

=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2012-02-18 16:13:04 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2012-03-01 19:29:03 +0000
@@ -1245,7 +1245,7 @@
         if autoconnecting:
             return management.find_credentials()
         else:
-            return management.register(window_id=0)  # no window ID
+            return management.login(window_id=0)  # no window ID
 
     @log_call(logger.debug)
     def disconnect(self):