Merge lp:~nataliabidart/desktopcouch/find-u1-credentials into lp:desktopcouch

[Natalia Bidart]

ubuntu_sso.find_credentials must be called when pairing ubuntu one records, so we can use U1 credentials if already on the system (LP: #694495).

[dobey (dobey)]

review: Approve

[Samuele Pedroni (pedronis)]

looks good, I still think even if ImportError is quite specific it would be better if the try except would bracket only the imports and not so much code

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~nataliabidart/desktopcouch/find-u1-credentials into lp:desktopcouch failed. Below is the output from the failed tests.

Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmp6bDFA6/data/couchdb.html
desktopcouch.application.tests.test_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ... [OK]
desktopcouch.application.tests.test_service
  TestService
    test_start_desktopcouch_replication ... [OK]
    test_start_new_desktopcouch_extensions ... [OK]
    test_start_new_desktopcouch_no_extensions ... [OK]
desktopcouch.application.tests.test_local_files
  TestKeyringIntegration
    test_with_auth ... [OK]
    test_with_no_auth ... [OK]
  TestLocalFiles
    test_all_files_returned ... [OK]
    test_bind_address ... [OK]
    test_couch_chain_ini_files ... [OK]
    test_xdg_overwrite_works ... [OK]
desktopcouch.application.tests.test_replication
  TestReplication
    test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpEnB1xn/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpfnK3HZ/data/couchdb.html
                                                    [OK]
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... test_migration_deleted_flag_to_trash
apple
                              [OK]
    test_migration_script_is_run ... test_migration_script_is_run
                                      [OK]
    test_migration_script_is_run_and_can_access_view ... test_migration_script_is_run_and_can_access_view
                  [OK]
  TestRegistration
    test_register_migration_is_added_to_the_registry ... [OK]
desktopcouch.application.platform.windows.tests.test_keyring
  TestKeyring
    test_get_oauth_data ... [OK]
    test_get_user_name_password ... [OK]
    test_get_user_name_password_no_key ... [OK]
    test_get_user_name_password_no_value ... [OK]
desktopcouch.application.pair.tests.test_couchdb_io
  TestCouchdbIo
    test_get_database_names_replicatable ... [OK]
    test_get_my_host_unique_id ... [OK]
    test_mkuri ... [OK]
    test_obsfuscation ... [OK]
    test_put_dynamic_paired_host ... [OK]
    test_put_static_paired_servic...

[lp:~nataliabidart/desktopcouch/find-u1-credentials]

244. By Natalia Bidart on 2011-01-03

Removed unused import.

245. By Natalia Bidart on 2011-01-03

Merged trunk in.

=== modified file 'desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py'
--- desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py	2010-12-17 15:59:00 +0000
+++ desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py	2011-01-03 17:31:11 +0000
@@ -18,30 +18,29 @@
 
 """Tests for the Ubuntu One pairing."""
 
+import ubuntu_sso
 
-import testtools
-from mocker import Mocker
+from mocker import MockerTestCase
 
 from desktopcouch.application.plugins import ubuntuone_pairing as uone
 from desktopcouch.application.plugins.ubuntuone_pairing import (
     pair_with_ubuntuone, U1_PAIR_RECORD, MAP_JS)
 
 
-class TestUbuntonePairing(testtools.TestCase):
+class TestUbuntonePairing(MockerTestCase):
     """Tests for Ubuntu One Pairing."""
 
     def setUp(self):
         """setup each test"""
         super(TestUbuntonePairing, self).setUp()
         # set a number of mocks that are used in all tests
-        self.mocker = Mocker()
         self.couchdb = self.mocker.mock()
         self.put_static_paired_service = self.mocker.replace(
             'desktopcouch.application.pair.couchdb_pairing.couchdb_io.' +
             'put_static_paired_service')
 
     def test_pair_with_ubuntuone_no_view(self):
-        """Tests that when the view is not present it is indeed created."""
+        """Test that when the view is not present it is indeed created."""
         self.couchdb.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD)
         self.mocker.result(False)
         # we are interested in the fact that the view is created
@@ -100,13 +99,11 @@
         self.mocker.verify()
 
 
-class TestUbuntuOnePlugin(testtools.TestCase):
+class TestUbuntuOnePlugin(MockerTestCase):
     """Test the signal handling in the plug-in."""
 
     def setUp(self):
         super(TestUbuntuOnePlugin, self).setUp()
-        self.mocker = Mocker()
-        self._bus = self.mocker.mock()
         self.called = False
 
     def test_got_new_credentials_other(self):
@@ -131,4 +128,30 @@
 
     def test_listen_to_dbus(self):
         """Test that listening to credentails works."""
-        uone.listen_to_dbus(bus=self._bus)
+        session_class = self.mocker.replace("dbus.SessionBus")
+        iface_class = self.mocker.replace("dbus.Interface")
+
+        session_class()
+        bus = self.mocker.mock()
+        self.mocker.result(bus)
+
+        iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
+        bus.add_signal_receiver(handler_function=uone.got_new_credentials,
+                                signal_name='CredentialsFound',
+                                dbus_interface=iface)
+
+        bus.get_object(ubuntu_sso.DBUS_BUS_NAME,
+                       ubuntu_sso.DBUS_CREDENTIALS_PATH,
+                       follow_name_owner_changes=True)
+        an_obj = self.mocker.mock()
+        self.mocker.result(an_obj)
+
+        iface_class(an_obj, dbus_interface=iface)
+        sso_backend = self.mocker.mock()
+        self.mocker.result(sso_backend)
+
+        sso_backend.find_credentials(uone.APP_NAME, {})
+
+        self.mocker.replay()
+
+        uone.listen_to_dbus()

=== modified file 'desktopcouch/application/plugins/ubuntuone_pairing.py'
--- desktopcouch/application/plugins/ubuntuone_pairing.py	2010-12-17 15:59:00 +0000
+++ desktopcouch/application/plugins/ubuntuone_pairing.py	2011-01-03 17:31:11 +0000
@@ -70,17 +70,25 @@
         pair_with_ubuntuone()
 
 
-def listen_to_dbus(bus=None):
+def listen_to_dbus():
     """Set up the signal handler on D-Bus for Ubuntu One pairing."""
-    if not bus:
-        import dbus
-        bus = dbus.SessionBus()
+    import dbus
+    bus = dbus.SessionBus()
 
     try:
-        from ubuntu_sso import DBUS_IFACE_CRED_NAME
+        import ubuntu_sso
+
+        iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
         bus.add_signal_receiver(handler_function=got_new_credentials,
                                 signal_name='CredentialsFound',
-                                dbus_interface=DBUS_IFACE_CRED_NAME)
+                                dbus_interface=iface)
+
+        obj = bus.get_object(ubuntu_sso.DBUS_BUS_NAME,
+                             ubuntu_sso.DBUS_CREDENTIALS_PATH,
+                             follow_name_owner_changes=True)
+        sso_backend = dbus.Interface(obj, dbus_interface=iface)
+        sso_backend.find_credentials(APP_NAME, {})
+
     except ImportError:
         logging.info('Ubuntu SSO is not available.')