Merge lp:~rodrigo-moya/ubuntu-sso-client/clear-token-api into lp:ubuntu-sso-client

[Rodrigo Moya]

Add clear_token DBus API (LP: #622833).

Add clear_token DBus API

[Natalia Bidart (nataliabidart)]

Tests please! :-)

review: Approve

[Natalia Bidart (nataliabidart)]

review: Needs Fixing

[lp:~rodrigo-moya/ubuntu-sso-client/clear-token-api]

582. By Rodrigo Moya on 2010-08-23

Added tests for new DBus API

583. By Rodrigo Moya on 2010-08-24

Merge from trunk

584. By Rodrigo Moya on 2010-08-24

Fixed docstring

585. By Rodrigo Moya on 2010-08-24

Make mr pep8 happy

586. By Rodrigo Moya on 2010-08-24

Fix logger.exception call

587. By Rodrigo Moya on 2010-08-24

Fix test

[Natalia Bidart (nataliabidart)]

review: Approve

[Alejandro J. Cura (alecu)]

Looks perfect.

review: Approve

=== modified file 'ubuntu_sso/main.py'
--- ubuntu_sso/main.py	2010-08-23 19:23:40 +0000
+++ ubuntu_sso/main.py	2010-08-24 13:07:56 +0000
@@ -559,6 +559,21 @@
             logger.exception(msg)
             self.CredentialsError(app_name, msg, traceback.format_exc())
 
+    @dbus.service.method(dbus_interface=DBUS_IFACE_CRED_NAME,
+                         in_signature='s', out_signature='')
+    def clear_token(self, app_name):
+        """Clear the token for an application from the keyring.
+
+        'app_name' is the name of the application.
+        """
+        try:
+            creds = Keyring(app_name)
+            creds.delete_ubuntusso_attr()
+        except Exception:
+            logger.exception(
+                "problem removing credentials from keyring for %s",
+                app_name)
+
 
 class LoginProcessor:
     """Actually do the work of processing passed parameters."""

=== modified file 'ubuntu_sso/tests/test_main.py'
--- ubuntu_sso/tests/test_main.py	2010-08-23 19:23:40 +0000
+++ ubuntu_sso/tests/test_main.py	2010-08-24 13:07:56 +0000
@@ -26,7 +26,7 @@
 import gobject
 
 from lazr.restfulclient.errors import HTTPError
-from mocker import Mocker, MockerTestCase, ARGS, KWARGS
+from mocker import Mocker, MockerTestCase, ARGS, KWARGS, ANY
 from twisted.internet.defer import Deferred
 from twisted.trial.unittest import TestCase
 
@@ -959,6 +959,30 @@
         client.login_to_get_credentials(*LOGIN_ONLY_ARGS)
         return d
 
+    def test_clear_token(self):
+        """Check that clear_token tries removing the correct token."""
+        mockKeyringClass = self.mocker.replace("ubuntu_sso.keyring.Keyring")
+        mockKeyringClass(APP_NAME)
+        mockKeyring = self.mocker.mock()
+        self.mocker.result(mockKeyring)
+        mockKeyring.delete_ubuntusso_attr()
+        self.mocker.replay()
+
+        client = SSOCredentials(self.mocker.mock())
+        client.clear_token(APP_NAME)
+
+    def test_clear_token_failed(self):
+        """Check that clear_token fails correctly."""
+        mockKeyringClass = self.mocker.replace("ubuntu_sso.keyring.Keyring")
+        mockKeyringClass(APP_NAME)
+        self.mocker.throw(self.mocker.mock())
+        fake_logger = self.mocker.replace("ubuntu_sso.main.logger")
+        fake_logger.exception(ANY, APP_NAME)
+        self.mocker.replay()
+
+        client = SSOCredentials(self.mocker.mock())
+        client.clear_token(APP_NAME)
+
     def test_login_error_cb(self):
         """The login error callback should throw the signal."""
         d = Deferred()