Merge lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-0.99.1 into lp:ubuntu/maverick/ubuntu-sso-client

[Natalia Bidart]

Critical bug fixes for v0.99.

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-08-12 00:00:08 +0000
+++ PKG-INFO	2010-08-19 17:58:43 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ubuntu-sso-client
-Version: 0.99
+Version: 0.99.1
 Summary: Ubuntu Single Sign-On client
 Home-page: https://launchpad.net/ubuntu-sso-client
 Author: Natalia Bidart

=== modified file 'bin/ubuntu-sso-login-gui'
--- bin/ubuntu-sso-login-gui	2010-08-12 00:00:08 +0000
+++ bin/ubuntu-sso-login-gui	2010-08-19 17:58:43 +0000
@@ -25,8 +25,8 @@
 from ubuntu_sso.gui import UbuntuSSOClientGUI
 
 
-APP_NAME = 'Super Testing App'
-TC_URI = 'http://ubuntu.com'
+APP_NAME = 'Ubuntu'
+TC_URI = 'http://one.ubuntu.com/terms'
 HELP_TEXT = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' \
             'Nam sed lorem nibh. Suspendisse gravida nulla non nunc suscipit ' \
             'pulvinar tempus ut augue.'

=== modified file 'data/ui.glade'
--- data/ui.glade	2010-08-12 00:00:08 +0000
+++ data/ui.glade	2010-08-19 17:58:43 +0000
@@ -349,6 +349,8 @@
   </object>
   <object class="GtkVBox" id="tc_browser_vbox">
     <property name="visible">True</property>
+    <signal name="hide" handler="on_tc_browser_vbox_hide"/>
+    <signal name="show" handler="on_tc_browser_vbox_show"/>
     <child>
       <object class="GtkScrolledWindow" id="tc_browser_window">
         <property name="visible">True</property>

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-12 09:38:17 +0000
+++ debian/changelog	2010-08-19 17:58:43 +0000
@@ -1,3 +1,13 @@
+ubuntu-sso-client (0.99.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - Delayed opening the webkit browser to the latest possible. (LP: #617041)
+    (nataliabidart)
+    - Use a proper dictionary with different attributes for each key so old
+    keys are not overwritten nor deleted. (LP: #617347) (alecu)
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Thu, 19 Aug 2010 13:02:10 -0300
+
 ubuntu-sso-client (0.99-0ubuntu1) maverick; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2010-08-11 16:18:28 +0000
+++ debian/control	2010-08-19 17:58:43 +0000
@@ -7,7 +7,7 @@
  python-support (>= 0.6.4),
  python-distutils-extra (>= 2.10)
 Maintainer: Natalia Bidart <[e-mail]>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 XS-Python-Version: current
 
 Package: ubuntu-sso-client

=== modified file 'run-tests'
--- run-tests	2010-08-11 17:03:11 +0000
+++ run-tests	2010-08-19 17:58:43 +0000
@@ -18,9 +18,11 @@
 `which xvfb-run` ./contrib/test $@
 pyflakes bin ubuntu_sso
 if [ -x `which pep8` ]; then
-    pep8 --repeat bin ubuntu_sso/gui.py ubuntu_sso/main.py \
-    ubuntu_sso/tests/test_gui.py ubuntu_sso/tests/test_main.py contrib/
+    pep8 --repeat bin/ contrib/ \
+    ubuntu_sso/gui.py ubuntu_sso/main.py ubuntu_sso/keyring.py \
+    ubuntu_sso/tests/test_gui.py ubuntu_sso/tests/test_main.py \
+    ubuntu_sso/tests/test_keyring.py
 else
     echo "Please install the 'pep8' package."
 fi
-rm -rf _trial_temp/
\ No newline at end of file
+rm -rf _trial_temp/

=== modified file 'setup.py'
--- setup.py	2010-08-12 00:00:08 +0000
+++ setup.py	2010-08-19 17:58:43 +0000
@@ -72,7 +72,7 @@
 
 setup(
     name='ubuntu-sso-client',
-    version='0.99',
+    version='0.99.1',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',

=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-08-12 00:00:08 +0000
+++ ubuntu_sso/gui.py	2010-08-19 17:58:43 +0000
@@ -153,8 +153,8 @@
     """Ubuntu single sign on GUI."""
 
     CAPTCHA_SOLUTION_ENTRY = _('Type the characters above')
-    CONNECT_HELP_LABEL = _('To connect this computer to') + ' %s ' + \
-                         _('enter your details below.')
+    CONNECT_HELP_LABEL = _('To connect this computer to %(app_name)s ' \
+                           'enter your details below.')
     EMAIL1_ENTRY = _('Email address')
     EMAIL2_ENTRY = _('Re-type Email address')
     EMAIL_MISMATCH = _('The email addresses don\'t match, please double check '
@@ -163,11 +163,11 @@
     EMAIL_TOKEN_ENTRY = _('Enter code verification here')
     FIELD_REQUIRED = _('This field is required.')
     FORGOTTEN_PASSWORD_BUTTON = _('I\'ve forgotten my password')
-    JOIN_HEADER_LABEL = _('Create') + ' %s ' + _('account')
+    JOIN_HEADER_LABEL = _('Create %(app_name)s account')
     LOADING = _('Loading...')
     LOGIN_BUTTON_LABEL = _('Already have an account? Click here to sign in')
     LOGIN_EMAIL_ENTRY = _('Email address')
-    LOGIN_HEADER_LABEL = _('Connect to') + ' %s'
+    LOGIN_HEADER_LABEL = _('Connect to %(app_name)s')
     LOGIN_PASSWORD_ENTRY = _('Password')
     NAME_ENTRY = _('Name')
     NEXT = _('Next')
@@ -185,9 +185,9 @@
     RESET_PASSWORD = _('Reset Password')
     RESET_CODE_ENTRY = _('Reset code')
     RESET_EMAIL_ENTRY = _('Email address')
-    SET_NEW_PASSWORD_LABEL = _('A password reset code has been sent to %s.\n' \
-                               'Please enter the code below along with your ' \
-                               'new password.')
+    SET_NEW_PASSWORD_LABEL = _('A password reset code has been sent to ' \
+                               '%(email)s.\nPlease enter the code below ' \
+                               'along with your new password.')
     SUCCESS = _('The process finished successfully. Congratulations!')
     TC = _('Terms & Conditions')
     TC_NOT_ACCEPTED = _('Agreeing to the Ubuntu One Terms & Conditions is '
@@ -198,8 +198,8 @@
 
 A verification code has just been sent to your email address.
 Please enter your code from the email. An example is shown below.""")
-    YES_TO_TC = _('I agree with the')
-    YES_TO_UPDATES = _('Yes! Email me tips and updates.')
+    YES_TO_TC = _('I agree with the %(app_name)s ')  # Terms&Conditions button
+    YES_TO_UPDATES = _('Yes! Email me %(app_name)s tips and updates.')
 
     def __init__(self, app_name, tc_uri, help_text,
                  window_id=0, login_only=False, close_callback=None):
@@ -211,7 +211,7 @@
         self._signals_receivers = {}
 
         self.app_name = app_name
-        self.app_label = '<b>%s</b>' % app_name
+        self.app_label = '<b>%s</b>' % self.app_name
         self.tc_uri = tc_uri
         self.help_text = help_text
         self.close_callback = close_callback
@@ -437,8 +437,8 @@
 
     def _build_enter_details_page(self):
         """Build the enter details page."""
-        self.enter_details_vbox.header = (self.JOIN_HEADER_LABEL %
-                                                            self.app_label)
+        d = {'app_name': self.app_label}
+        self.enter_details_vbox.header = self.JOIN_HEADER_LABEL % d
         self.enter_details_vbox.help_text = self.help_text
 
         self.enter_details_vbox.pack_start(self.name_entry, expand=False)
@@ -461,8 +461,10 @@
         else:
             self._set_captcha_image()
 
-        self.yes_to_updates_checkbutton.set_label(self.YES_TO_UPDATES)
-        self.yes_to_tc_checkbutton.set_label(self.YES_TO_TC)
+        msg = self.YES_TO_UPDATES % {'app_name': self.app_name}
+        self.yes_to_updates_checkbutton.set_label(msg)
+        msg = self.YES_TO_TC % {'app_name': self.app_name}
+        self.yes_to_tc_checkbutton.set_label(msg)
         self.tc_button.set_label(self.TC)
         self.login_button.set_label(self.LOGIN_BUTTON_LABEL)
 
@@ -476,11 +478,6 @@
 
     def _build_tc_page(self):
         """Build the Terms & Conditions page."""
-        self.tc_browser = webkit.WebView()
-        self.tc_browser.open(self.tc_uri)
-        self.tc_browser.show()
-        self.tc_browser_window.add(self.tc_browser)
-
         return self.tc_browser_vbox
 
     def _build_processing_page(self):
@@ -510,8 +507,9 @@
 
     def _build_login_page(self):
         """Build the login page."""
-        self.login_vbox.header = self.LOGIN_HEADER_LABEL % self.app_label
-        self.login_vbox.help_text = self.CONNECT_HELP_LABEL % self.app_label
+        d = {'app_name': self.app_label}
+        self.login_vbox.header = self.LOGIN_HEADER_LABEL % d
+        self.login_vbox.help_text = self.CONNECT_HELP_LABEL % d
 
         self.login_details_vbox.pack_start(self.login_email_entry)
         self.login_details_vbox.reorder_child(self.login_email_entry, 0)
@@ -777,6 +775,22 @@
 
         self._set_current_page(self.processing_vbox)
 
+    def on_tc_browser_vbox_show(self, *args, **kwargs):
+        """The T&C page is being shown."""
+        browser = webkit.WebView()
+        browser.open(self.tc_uri)
+        browser.show()
+        self.tc_browser_window.add(browser)
+
+    def on_tc_browser_vbox_hide(self, *args, **kwargs):
+        """The T&C page is no longer being shown."""
+        children = self.tc_browser_window.get_children()
+        if len(children) > 0:
+            browser = children[0]
+            self.tc_browser_window.remove(browser)
+            browser.destroy()
+            del browser
+
     # backend callbacks
 
     def on_captcha_generated(self, captcha_id, *args, **kwargs):
@@ -836,8 +850,9 @@
 
     def on_password_reset_token_sent(self, email, *args, **kwargs):
         """Password reset token was successfully sent."""
-        e = self.reset_email_entry.get_text()
-        self.set_new_password_vbox.help_text = self.SET_NEW_PASSWORD_LABEL % e
+        email = self.reset_email_entry.get_text()
+        msg = self.SET_NEW_PASSWORD_LABEL % {'email': email}
+        self.set_new_password_vbox.help_text = msg
         self._set_current_page(self.set_new_password_vbox)
 
     def on_password_reset_error(self, *args, **kwargs):

=== modified file 'ubuntu_sso/keyring.py'
--- ubuntu_sso/keyring.py	2010-08-11 17:03:11 +0000
+++ ubuntu_sso/keyring.py	2010-08-19 17:58:43 +0000
@@ -1,111 +1,112 @@
-# Copyright (C) 2010 Canonical
-#
-# Authors:
-#  Andrew Higginson
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 3.
-#
-# This program 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 General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-import gnomekeyring
-
-from urllib import urlencode
-from urlparse import parse_qsl
-
-class Keyring(object):
-
-    KEYRING_NAME = "login"
-
-    def __init__(self, app_name):
-
-        if not gnomekeyring.is_available():
-            raise gnomekeyring.NoKeyringDaemonError
-        self.app_name = app_name
-
-    def _create_keyring(self, name):
-        """
-        Creates a keyring, if it already exists,
-        it does nothing
-        """
-        keyring_names = gnomekeyring.list_keyring_names_sync()
-        if not name in keyring_names:
-            gnomekeyring.create_sync(name)
-
-    def _item_exists(self, sync, name):
-        """
-        Returns whether a named item exists in a
-        named keyring
-        """
-        return self._get_item_id_from_name(sync, name) != None
-
-    def _get_item_id_from_name(self, sync, name):
-        """
-        Returns the ID for a named item
-        """
-        for item_id in gnomekeyring.list_item_ids_sync(sync):
-            item_info = gnomekeyring.item_get_info_sync(sync, item_id)
-            display_name = item_info.get_display_name()
-            if display_name == name:
-                return item_id
-        return None
-
-    def _get_item_info_from_name(self, sync, name):
-        """
-        Returns the ID for a named item
-        """
-        for item_id in gnomekeyring.list_item_ids_sync(sync):
-            item_info = gnomekeyring.item_get_info_sync(sync, item_id)
-            display_name = item_info.get_display_name()
-            if display_name == name:
-                return item_info
-        return None
-
-    def set_ubuntusso_attr(self, attr):
-        """
-        Sets the attributes of the Ubuntu SSO item
-        """
-        # Creates the secret from the attributes
-        secret = urlencode(attr)
-
-        # Create the keyring
-        self._create_keyring(self.KEYRING_NAME)
-
-        # If the item already exists, delete it
-        if self._item_exists(self.KEYRING_NAME, self.app_name):
-            item_id = self._get_item_id_from_name(self.KEYRING_NAME,
-                                                  self.app_name)
-            gnomekeyring.item_delete_sync(self.KEYRING_NAME, item_id)
-
-        # Add our SSO item
-        gnomekeyring.item_create_sync(self.KEYRING_NAME,
-                gnomekeyring.ITEM_GENERIC_SECRET, self.app_name, {},
-                secret, True)
-
-    def get_ubuntusso_attr(self):
-        """
-        Returns the secret of the SSO item in a dictionary
-        """
-        # If we have no attributes, return None
-        if self._get_item_info_from_name(self.KEYRING_NAME,
-                                         self.app_name) == None:
-            return None
-        secret = self._get_item_info_from_name(self.KEYRING_NAME,
-                                               self.app_name).get_secret()
-        return dict(parse_qsl(secret))
-
-if __name__ == "__main__":
-    SSO_ITEM_NAME = "Software Center UbuntuSSO token"
-    keyring = Keyring(SSO_ITEM_NAME)
-    keyring.set_ubuntusso_attr({"ha":"hehddddeff", "hi":"hggehes", "ho":"he"})
-    print keyring.get_ubuntusso_attr()
-
-
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#  Alejandro J. Cura <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program 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 General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Handle keys in the gnome kerying."""
+
+import gnomekeyring
+
+from urllib import urlencode
+from urlparse import parse_qsl
+
+
+class Keyring(object):
+
+    KEYRING_NAME = "login"
+
+    def __init__(self, app_name):
+        if not gnomekeyring.is_available():
+            raise gnomekeyring.NoKeyringDaemonError
+        self.app_name = app_name
+
+    def _create_keyring(self, name):
+        """Creates a keyring, if it already exists, do nothing."""
+        keyring_names = gnomekeyring.list_keyring_names_sync()
+        if not name in keyring_names:
+            gnomekeyring.create_sync(name)
+
+    def _get_item_id_from_name(self, sync, name):
+        """Return the ID for a named item."""
+        for item_id in gnomekeyring.list_item_ids_sync(sync):
+            item_info = gnomekeyring.item_get_info_sync(sync, item_id)
+            display_name = item_info.get_display_name()
+            if display_name == name:
+                return item_id
+
+    def _get_item_info_from_name(self, sync, name):
+        """Return the ID for a named item."""
+        for item_id in gnomekeyring.list_item_ids_sync(sync):
+            item_info = gnomekeyring.item_get_info_sync(sync, item_id)
+            display_name = item_info.get_display_name()
+            if display_name == name:
+                return item_info
+
+    def set_ubuntusso_attr(self, cred):
+        """Set the credentials of the Ubuntu SSO item."""
+        # Creates the secret from the credentials
+        secret = urlencode(cred)
+
+        # Create the keyring
+        self._create_keyring(self.KEYRING_NAME)
+
+        # No need to delete the item if it already exists
+
+        # A set of attributes for this credentials
+        attr = {"key-type": "Ubuntu SSO credentials",
+                "token-name": cred["name"].encode("utf8")}
+
+        # Add our SSO credentials to the keyring
+        gnomekeyring.item_create_sync(self.KEYRING_NAME,
+                gnomekeyring.ITEM_GENERIC_SECRET, self.app_name, attr,
+                secret, True)
+
+    def get_ubuntusso_attr(self):
+        """Return the secret of the SSO item in a dictionary."""
+        # If we have no attributes, return None
+        exist = self._get_item_info_from_name(self.KEYRING_NAME, self.app_name)
+        if exist is not None:
+            secret = self._get_item_info_from_name(self.KEYRING_NAME,
+                                                   self.app_name).get_secret()
+            return dict(parse_qsl(secret))
+
+    def delete_ubuntusso_attr(self):
+        """Delete a set of credentials from the keyring."""
+        item_id = self._get_item_id_from_name(self.KEYRING_NAME,
+                                              self.app_name)
+        if item_id is not None:
+            gnomekeyring.item_delete_sync(self.KEYRING_NAME, item_id)
+
+
+if __name__ == "__main__":
+    kr1 = Keyring("Test key 1")
+    kr2 = Keyring("Test key 2")
+
+    kr1.delete_ubuntusso_attr()
+    kr2.delete_ubuntusso_attr()
+
+    d1 = {"name": "test-1", "ha": "hehddddeff", "hi": "hggehes", "ho": "he"}
+    d2 = {"name": "test-2", "hi": "ho", "let's": "go"}
+
+    kr1.set_ubuntusso_attr(d1)
+    kr2.set_ubuntusso_attr(d2)
+
+    r1 = kr1.get_ubuntusso_attr()
+    r2 = kr2.get_ubuntusso_attr()
+
+    assert r1 == d1
+    assert r2 == d2

=== modified file 'ubuntu_sso/main.py'
--- ubuntu_sso/main.py	2010-08-12 00:00:08 +0000
+++ ubuntu_sso/main.py	2010-08-19 17:58:43 +0000
@@ -199,8 +199,8 @@
             logger.exception('login failed with:')
             raise AuthenticationError()
 
-        logger.debug('login: authentication successful! consumer_key: %r',
-                     credentials['consumer_key'])
+        logger.debug('login: authentication successful! consumer_key: %r, ' \
+                     'token_name: %r', credentials['consumer_key'], token_name)
         keyring_store_credentials(app_name, credentials)
         return credentials
 
@@ -413,8 +413,8 @@
 class SSOCredentials(dbus.service.Object):
     """DBus object that gets credentials, and login/registers if needed."""
 
-    @dbus.service.signal(DBUS_IFACE_CRED_NAME, signature="s")
-    def AuthorizationDenied(self, app_name):
+    @dbus.service.signal(DBUS_IFACE_CRED_NAME, signature="")
+    def AuthorizationDenied(self):
         """Signal thrown when the user denies the authorization."""
 
     @dbus.service.signal(DBUS_IFACE_CRED_NAME, signature="a{ss}")

=== modified file 'ubuntu_sso/tests/test_gui.py'
--- ubuntu_sso/tests/test_gui.py	2010-08-12 00:00:08 +0000
+++ ubuntu_sso/tests/test_gui.py	2010-08-19 17:58:43 +0000
@@ -22,10 +22,10 @@
 import itertools
 import logging
 import os
-import socket
 
 import dbus
 import gtk
+import webkit
 
 from twisted.trial.unittest import TestCase
 
@@ -300,7 +300,6 @@
         super(UbuntuSSOClientTestCase, self).setUp()
         self.patch(dbus, 'SessionBus', FakedSessionBus)
         self.patch(dbus, 'Interface', FakedSSOBackend)
-        self.patch(socket, 'gethostname', lambda: TOKEN_NAME)
         self.pages = ('enter_details', 'processing', 'verify_email', 'success',
                       'tc_browser', 'login', 'request_password_token',
                       'set_new_password')
@@ -562,7 +561,7 @@
     def test_initial_text_for_header_label(self):
         """The header must have the correct text at startup."""
         msg = 'Text for the header must be "%s" (got "%s" instead).'
-        expected = self.ui.JOIN_HEADER_LABEL % APP_NAME
+        expected = self.ui.JOIN_HEADER_LABEL % {'app_name': APP_NAME}
         actual = self.ui.header_label.get_text()
         # text content is correct
         self.assertEqual(expected, actual, msg % (expected, actual))
@@ -583,11 +582,11 @@
     def test_initial_texts_for_checkbuttons(self):
         """Check buttons have the correct text at startup."""
         msg = 'Text for "%s" must be "%s" (got "%s" instead).'
-        expected = self.ui.YES_TO_UPDATES
+        expected = self.ui.YES_TO_UPDATES % {'app_name': APP_NAME}
         actual = self.ui.yes_to_updates_checkbutton.get_label()
         self.assertEqual(expected, actual, msg % ('yes_to_updates_checkbutton',
                                                   expected, actual))
-        expected = self.ui.YES_TO_TC
+        expected = self.ui.YES_TO_TC % {'app_name': APP_NAME}
         actual = self.ui.yes_to_tc_checkbutton.get_label()
         self.assertEqual(expected, actual,
                          msg % ('yes_to_tc_checkbutton', expected, actual))
@@ -731,6 +730,29 @@
 class TermsAndConditionsTestCase(UbuntuSSOClientTestCase):
     """Test suite for the user registration (terms & conditions page)."""
 
+    def test_tc_browser_is_created_when_tc_page_is_shown(self):
+        """The webkit browser is created when the TC page is shown."""
+        self.ui.tc_browser_vbox.show()
+
+        children = self.ui.tc_browser_window.get_children()
+        self.assertEqual(1, len(children))
+        browser = children[0]
+        self.assertIsInstance(browser, webkit.WebView)
+        self.assertTrue(browser.get_property('visible'))
+
+        self.ui.tc_browser_vbox.hide()
+
+    def test_tc_browser_is_destroyed_when_tc_page_is_hid(self):
+        """The webkit browser is destroyed when the TC page is hid."""
+        self.ui.tc_browser_vbox.show()
+        browser = self.ui.tc_browser_window.get_children()[0]
+        self.patch(browser, 'destroy', self._set_called)
+        self.ui.tc_browser_vbox.hide()
+
+        children = self.ui.tc_browser_window.get_children()
+        self.assertEqual(0, len(children))
+        self.assertEqual(self._called, ((), {}))
+
     def test_tc_button_clicked_morphs_into_tc_browser_vbox(self):
         """Terms & Conditions morphs to a browser window."""
         self.ui.tc_button.clicked()
@@ -1001,14 +1023,14 @@
     def test_initial_text_for_header_label(self):
         """The header must have the correct text when logging in."""
         msg = 'Text for the header must be "%s" (got "%s" instead).'
-        expected = self.ui.LOGIN_HEADER_LABEL % APP_NAME
+        expected = self.ui.LOGIN_HEADER_LABEL % {'app_name': APP_NAME}
         actual = self.ui.header_label.get_text()
         self.assertEqual(expected, actual, msg % (expected, actual))
 
     def test_initial_text_for_help_label(self):
         """The help must have the correct text at startup."""
         msg = 'Text for the help must be "%s" (got "%s" instead).'
-        expected = self.ui.CONNECT_HELP_LABEL % APP_NAME
+        expected = self.ui.CONNECT_HELP_LABEL % {'app_name': APP_NAME}
         actual = self.ui.help_label.get_text()
         self.assertEqual(expected, actual, msg % (expected, actual))
 
@@ -1225,7 +1247,7 @@
         self.ui.on_password_reset_token_sent(email=EMAIL)
 
         self.assertEqual(self.ui.help_label.get_text(),
-                         self.ui.SET_NEW_PASSWORD_LABEL % EMAIL)
+                         self.ui.SET_NEW_PASSWORD_LABEL % {'email': EMAIL})
 
     def test_on_password_reset_token_sent_ok_button(self):
         """After request_password_token_ok_button the ok button is updated."""

=== added file 'ubuntu_sso/tests/test_keyring.py'
--- ubuntu_sso/tests/test_keyring.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/tests/test_keyring.py	2010-08-19 17:58:43 +0000
@@ -0,0 +1,115 @@
+# test_keyring - tests for ubuntu_sso.keyring
+#
+# Author: Alejandro J. Cura <[e-mail]>
+#
+# Copyright 2010 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Tests for the keyring.py module."""
+
+import gnomekeyring
+from twisted.trial.unittest import TestCase
+
+from ubuntu_sso import keyring
+
+
+class MockInfoSync(object):
+    """A mock object that represents a fake key."""
+
+    def __init__(self, (key, key_name, secret)):
+        """Initialize this instance."""
+        self.key = key
+        self.key_name = key_name
+        self.secret = secret
+
+    def get_display_name(self):
+        """Return info on the mocked object."""
+        return self.key_name
+
+
+class MockGnomeKeyring(object):
+    """A mock keyring that stores keys according to a given attr."""
+
+    def __init__(self):
+        """Initialize this instance."""
+        self.keyrings = set()
+        self.store = []
+        self.deleted = []
+
+    def item_create_sync(self, keyring_name, item_type, key_name, attr,
+                         secret, update_if_exists):
+        """Sets a value in the keyring."""
+        # we'll use the attr as the dict key, so make it a tuple
+        key = tuple(attr.items())
+        self.store.append((key, key_name, secret))
+
+    def item_delete_sync(self, keyring_name, item_id):
+        """Makes a list of deleted items."""
+        key, key_name, secret = self.store.pop(item_id)
+        self.deleted.append(key_name)
+
+    def list_item_ids_sync(self, keyring_name):
+        """Return a list of ids for all the items."""
+        return [n for n, v in enumerate(self.store)]
+
+    def item_get_info_sync(self, keyring_name, item_id):
+        """Return an info sync object for the item."""
+        return MockInfoSync(self.store[item_id])
+
+    def list_keyring_names_sync(self):
+        """The keyring you are looking for may be here."""
+        return self.keyrings
+
+    def create_sync(self, name):
+        """Thanks, I'll create that keyring for you."""
+        self.keyrings.add(name)
+
+    def is_available(self):
+        """A very available keyring."""
+        return True
+
+
+class TestKeyring(TestCase):
+    """Test the gnome keyring related functions."""
+    def setUp(self):
+        """Initialize the mock used in these tests."""
+        self.mgk = MockGnomeKeyring()
+        self.patch(gnomekeyring, "item_create_sync", self.mgk.item_create_sync)
+        self.patch(gnomekeyring, "is_available", self.mgk.is_available)
+        self.patch(gnomekeyring, "create_sync", self.mgk.create_sync)
+        self.patch(gnomekeyring, "list_keyring_names_sync",
+                                              self.mgk.list_keyring_names_sync)
+        self.patch(gnomekeyring, "list_item_ids_sync",
+                                                   self.mgk.list_item_ids_sync)
+        self.patch(gnomekeyring, "item_get_info_sync",
+                                                   self.mgk.item_get_info_sync)
+        self.patch(gnomekeyring, "item_delete_sync", self.mgk.item_delete_sync)
+
+    def test_set_ubuntusso(self):
+        """Test that the set method does not erase previous keys."""
+        sample_creds = {"name": "sample creds name"}
+        sample_creds2 = {"name": "sample creds name 2"}
+        keyring.Keyring("appname").set_ubuntusso_attr(sample_creds)
+        keyring.Keyring("appname").set_ubuntusso_attr(sample_creds2)
+
+        self.assertEqual(len(self.mgk.store), 2)
+        self.assertEqual(len(self.mgk.deleted), 0)
+
+    def test_delete_ubuntusso(self):
+        """Test that a given key is deleted."""
+        sample_creds = {"name": "sample creds name"}
+        keyring.Keyring("appname").set_ubuntusso_attr(sample_creds)
+        keyring.Keyring("appname").delete_ubuntusso_attr()
+
+        self.assertEqual(len(self.mgk.store), 0)
+        self.assertEqual(len(self.mgk.deleted), 1)