Merge lp:~mandel/desktopcouch/improve_keyring_tests into lp:desktopcouch

[Manuel de la Peña]

Increase the test coverage of the Keyring class that uses gnomekeyring as its backend.

Increase the test coverage of the Keyring class that uses gnomekeyring as its backed.

[Eric Casteleijn (thisfred)]

The amount of awesome is overwhelming today.

review: Approve

[Vincenzo Di Somma (vds)]

review: Approve

[dobey (dobey)]

The prerequisite lp:~mandel/desktopcouch/move_xdg_to_platform has not yet been merged into lp:desktopcouch.

[Ubuntu One Auto Pilot (otto-pilot)]

No proposals found for merge of lp:~mandel/desktopcouch/move_xdg_to_platform into lp:desktopcouch.

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:desktopcouch failed due to conflicts:

text conflict in desktopcouch/application/platform/linux/keyring.py

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mandel/desktopcouch/improve_keyring_tests 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/tmpDLcJxq/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/tmpPj_Wtg/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpZo6fyl/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.linux.tests.test_keyring
  TestGnomeKeyring
    test_get_aouth_no_keyring ... Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 311, in run
    self.setUp()
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/platform/linux/tests/test_keyring.py", line 33, in setUp
    keyring=self._gnomekeyring)
exceptions.TypeError: __init__() got an unexpected keyword argument 'make_random_string'
[ERROR]
    test_get_oauth_canceled_store ... Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 311, in run
    self.setUp()
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/platform/linux/tests/test_keyring.py", line 33, in setUp
    keyring=self._gnomekeyring)
exceptions.TypeError: __init__() got an unexpected keyword argument 'make_random_string'
[ERROR]
    test_...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mandel/desktopcouch/improve_keyring_tests 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/tmp1lBCOH/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/tmpnrtXSs/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmp69ks0D/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.linux.tests.test_keyring
  TestGnomeKeyring
    test_get_aouth_no_keyring ... [OK]
    test_get_oauth_canceled_store ... [OK]
    test_get_oauth_data_stored ... [OK]
    test_get_user_name_password_keyring ... [OK]
    test_get_user_name_password_no_daemon ... [OK]
    test_get_user_name_password_not_in_keyring ... [OK]
    test_get_user_name_password_user_cancel ... [OK]
desktopcouch.application.platform.windows.tests.test_keyring
  TestKeyring
    test_get_oauth_data ... [OK]
    test_get_user_name_password ... [OK]
    test_get_user_name_passw...

[lp:~mandel/desktopcouch/improve_keyring_tests]

196. By Manuel de la Peña on 2011-01-03

Merged with trunk, fixed lint and pep8 warnings.

=== added directory 'desktopcouch/application/platform/linux/tests'
=== added file 'desktopcouch/application/platform/linux/tests/__init__.py'
--- desktopcouch/application/platform/linux/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ desktopcouch/application/platform/linux/tests/__init__.py	2011-01-04 17:08:43 +0000
@@ -0,0 +1,1 @@
+"""Test the linux platform code."""

=== added file 'desktopcouch/application/platform/linux/tests/test_keyring.py'
--- desktopcouch/application/platform/linux/tests/test_keyring.py	1970-01-01 00:00:00 +0000
+++ desktopcouch/application/platform/linux/tests/test_keyring.py	2011-01-04 17:08:43 +0000
@@ -0,0 +1,193 @@
+# Copyright 2009 Canonical Ltd.
+#
+# This file is part of desktopcouch.
+#
+#  desktopcouch is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+#
+# desktopcouch is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with desktopcouch.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Manuel de la Pena <[e-mail]>
+"""Test the linux keyring implementation."""
+from mocker import MockerTestCase, ANY
+
+import gnomekeyring
+
+from desktopcouch.application.platform.linux.keyring import Keyring
+
+
+# pylint: disable=W0104
+class TestGnomeKeyring(MockerTestCase):
+    """Test the interaction with the gnome keyring."""
+
+    def setUp(self):
+        super(TestGnomeKeyring, self).setUp()
+        self._gnomekeyring = self.mocker.mock()
+        self._random_string = self.mocker.mock()
+        self._data = self.mocker.mock()
+        self._keyring = Keyring(make_random_string_fn=self._random_string,
+            keyring=self._gnomekeyring)
+
+    def test_get_user_name_password_keyring(self):
+        """Test the retrieval of the data when is present in the ring."""
+        user_name = 'mandel'
+        password = 'test'
+        self._gnomekeyring.ITEM_GENERIC_SECRET
+        self.mocker.result(0)
+        self._gnomekeyring.find_items_sync(0, {'desktopcouch': 'basic'})
+        self.mocker.result(self._data)
+        self._data[0].secret
+        self.mocker.result("%s:%s" % (user_name, password))
+        self.mocker.replay()
+        result_user, result_pass = self._keyring.get_user_name_password()
+        self.assertEqual(result_user, user_name)
+        self.assertEqual(result_pass, password)
+
+    def test_get_user_name_password_not_in_keyring(self):
+        """Test the retrieval of the data when missing from the ring."""
+        user_name = 'mandel'
+        password = 'test'
+        self._gnomekeyring.ITEM_GENERIC_SECRET
+        self.mocker.result(0)
+        self._gnomekeyring.find_items_sync(0, {'desktopcouch': 'basic'})
+        self.mocker.throw(gnomekeyring.NoMatchError)
+        self._random_string(10)
+        self.mocker.result(user_name)
+        self._random_string(10)
+        self.mocker.result(password)
+        self._gnomekeyring.item_create_sync(None, 0, ANY,
+            {'desktopcouch': 'basic'}, "%s:%s" % (user_name, password), True)
+        self.mocker.replay()
+        result_user, result_pass = self._keyring.get_user_name_password()
+        self.assertEqual(result_user, user_name)
+        self.assertEqual(result_pass, password)
+
+    def test_get_user_name_password_user_cancel(self):
+        """Test the retrieva of the data when the user denies the access."""
+        user_name = 'mandel'
+        password = 'test'
+        self._gnomekeyring.ITEM_GENERIC_SECRET
+        self.mocker.result(0)
+        self._gnomekeyring.find_items_sync(0, {'desktopcouch': 'basic'})
+        self.mocker.throw(gnomekeyring.NoMatchError)
+        self._random_string(10)
+        self.mocker.result(user_name)
+        self._random_string(10)
+        self.mocker.result(password)
+        self._gnomekeyring.item_create_sync(None, 0, ANY,
+            {'desktopcouch': 'basic'}, "%s:%s" % (user_name, password), True)
+        self.mocker.throw(gnomekeyring.NoKeyringDaemonError)
+        self.mocker.replay()
+        result_user, result_pass = self._keyring.get_user_name_password()
+        self.assertEqual(result_user, user_name)
+        self.assertEqual(result_pass, password)
+
+    def test_get_user_name_password_no_daemon(self):
+        """Test the retrieval when the keyring daemon is not running."""
+        user_name = 'mandel'
+        password = 'test'
+        self._gnomekeyring.ITEM_GENERIC_SECRET
+        self.mocker.result(0)
+        self._gnomekeyring.find_items_sync(0, {'desktopcouch': 'basic'})
+        self.mocker.throw(gnomekeyring.NoMatchError)
+        self._random_string(10)
+        self.mocker.result(user_name)
+        self._random_string(10)
+        self.mocker.result(password)
+        self._gnomekeyring.item_create_sync(None, 0, ANY,
+            {'desktopcouch': 'basic'}, "%s:%s" % (user_name, password), True)
+        self.mocker.throw(gnomekeyring.NoKeyringDaemonError)
+        self.mocker.replay()
+        result_user, result_pass = self._keyring.get_user_name_password()
+        self.assertEqual(result_user, user_name)
+        self.assertEqual(result_pass, password)
+
+    def test_get_oauth_data_stored(self):
+        """Test the storeage of the oath data."""
+        consumer_key = 'consumer_key'
+        consumer_secret = 'consumer_secret'
+        token = 'token'
+        token_secret = 'token_secret'
+        self._random_string(10)
+        self.mocker.result(consumer_key)
+        self._random_string(10)
+        self.mocker.result(consumer_secret)
+        self._random_string(10)
+        self.mocker.result(token)
+        self._random_string(10)
+        self.mocker.result(token_secret)
+        self._gnomekeyring.item_create_sync(
+            None, ANY, ANY,
+            {'desktopcouch': 'oauth'},
+            "%s:%s:%s:%s" %
+                (consumer_key, consumer_secret, token, token_secret), True)
+        self.mocker.replay()
+        result_consumer_key, result_consumer_secret, result_token, \
+            result_token_secret = self._keyring.get_oauth_data()
+        self.assertEqual(consumer_key, result_consumer_key)
+        self.assertEqual(consumer_secret, result_consumer_secret)
+        self.assertEqual(token, result_token)
+        self.assertEqual(token_secret, result_token_secret)
+
+    def test_get_aouth_no_keyring(self):
+        """Test the retrieval of the oauth data without a keyring."""
+        consumer_key = 'consumer_key'
+        consumer_secret = 'consumer_secret'
+        token = 'token'
+        token_secret = 'token_secret'
+        self._random_string(10)
+        self.mocker.result(consumer_key)
+        self._random_string(10)
+        self.mocker.result(consumer_secret)
+        self._random_string(10)
+        self.mocker.result(token)
+        self._random_string(10)
+        self.mocker.result(token_secret)
+        self._gnomekeyring.item_create_sync(
+            None, ANY, ANY,
+            {'desktopcouch': 'oauth'},
+            "%s:%s:%s:%s" %
+                (consumer_key, consumer_secret, token, token_secret), True)
+        self.mocker.throw(gnomekeyring.NoKeyringDaemonError)
+        self.mocker.replay()
+        result_consumer_key, result_consumer_secret, result_token, \
+            result_token_secret = self._keyring.get_oauth_data()
+        self.assertEqual(consumer_key, result_consumer_key)
+        self.assertEqual(consumer_secret, result_consumer_secret)
+        self.assertEqual(token, result_token)
+        self.assertEqual(token_secret, result_token_secret)
+
+    def test_get_oauth_canceled_store(self):
+        """Test the retrieval of the oauth data when the user cancels it."""
+        consumer_key = 'consumer_key'
+        consumer_secret = 'consumer_secret'
+        token = 'token'
+        token_secret = 'token_secret'
+        self._random_string(10)
+        self.mocker.result(consumer_key)
+        self._random_string(10)
+        self.mocker.result(consumer_secret)
+        self._random_string(10)
+        self.mocker.result(token)
+        self._random_string(10)
+        self.mocker.result(token_secret)
+        self._gnomekeyring.item_create_sync(
+            None, ANY, ANY,
+            {'desktopcouch': 'oauth'},
+            "%s:%s:%s:%s" %
+                (consumer_key, consumer_secret, token, token_secret), True)
+        self.mocker.throw(gnomekeyring.CancelledError)
+        self.mocker.replay()
+        result_consumer_key, result_consumer_secret, result_token, \
+            result_token_secret = self._keyring.get_oauth_data()
+        self.assertEqual(consumer_key, result_consumer_key)
+        self.assertEqual(consumer_secret, result_consumer_secret)
+        self.assertEqual(token, result_token)
+        self.assertEqual(token_secret, result_token_secret)