Merge lp:~cmiller/desktopcouch/sso-app-fixes into lp:desktopcouch

[Chad Miller]

Fix one typo in an exception name, move default value settings higher to make exec paths irrelevant to their existence, and restructure code to make it testable and tested (LP: #641381)

[Manuel de la Peña (mandel)]

superb!

review: Approve

[Vincenzo Di Somma (vds)]

Great! Thanks for fixing it so quickly! :)

review: Approve

=== modified file 'desktopcouch/start_local_couchdb.py'
--- desktopcouch/start_local_couchdb.py	2010-09-09 13:35:18 +0000
+++ desktopcouch/start_local_couchdb.py	2010-09-17 15:31:19 +0000
@@ -203,23 +203,22 @@
         fp.close()
 
 
-def update_pairing_service(sso=None):
+def update_pairing_service(sso=None, test_import_fails=False):
     """Update the pairing records between desktopcouch and Ubuntu One."""
     if not sso:
         try:
             # get the credentials using ubuntu sso dbus
+            if test_import_fails:
+                raise ImportError
             from ubuntu_sso.main import SSOCredentials
-            sso_finder = SSOCredentials()
-        except ImportErrro:
-            logging.warn("Ubuntu SSO dbus service could not be used.")
-    # test again to see if we did not get an import error
-    else:
-        sso_finder = sso
+            sso = SSOCredentials()
+        except ImportError:
+            logging.info("Ubuntu SSO dbus service could not be used.")
 
-    if sso_finder: 
-        credentials = sso_finder.find_credentials('Ubuntu One')
-    if credentials and len(credentials) > 0:
-        pair_with_ubuntuone()
+    if sso: 
+        credentials = sso.find_credentials('Ubuntu One')
+        if credentials and len(credentials) > 0:
+            pair_with_ubuntuone()
  
 def start_couchdb(ctx=local_files.DEFAULT_CONTEXT):
     """Execute each step to start a desktop CouchDB."""

=== modified file 'desktopcouch/tests/test_start_local_couchdb.py'
--- desktopcouch/tests/test_start_local_couchdb.py	2010-09-08 14:08:41 +0000
+++ desktopcouch/tests/test_start_local_couchdb.py	2010-09-17 15:31:19 +0000
@@ -137,7 +137,7 @@
         mocker.restore()
         mocker.verify()
 
-    def test_pair_ubuntuone(self):
+    def test_pair_ubuntuone_with_sso(self):
         """ Test the pairing with ubuntu one.
         
         Ensure that the pair ubuntu one method is called when we do have
@@ -158,3 +158,22 @@
         update_pairing_service(sso_mock)
         mocker.verify()
 
+    def test_pair_ubuntuone_without_sso(self):
+        """ Test the pairing with ubuntu one.
+        
+        Ensure that the pair ubuntu one method is called when we do have
+        credentials.
+        """
+        from desktopcouch.start_local_couchdb import update_pairing_service
+        mocker = Mocker()
+        pair_ubuntu_one_mock = mocker.replace(
+            'desktopcouch.pair.couchdb_pairing.' + 
+            'ubuntuone_pairing.pair_with_ubuntuone')
+        # make the sso credentials return a dictionary with fake data
+        mocker.result({'fake':'credential'})
+        # pair with ubuntu one never called!
+        mocker.replay()
+        # call the start method to ensure that the methods are correctly called
+        update_pairing_service(sso=None, test_import_fails=True)
+        mocker.verify()
+