1
=== modified file 'ubuntu_sso/main.py'
2
--- ubuntu_sso/main.py	2010-08-23 19:23:40 +0000
3
+++ ubuntu_sso/main.py	2010-08-24 13:07:56 +0000
4
@@ -559,6 +559,21 @@
5
559
            logger.exception(msg)
559
            logger.exception(msg)
6
560
            self.CredentialsError(app_name, msg, traceback.format_exc())
560
            self.CredentialsError(app_name, msg, traceback.format_exc())
7
561
561
8
562
    @dbus.service.method(dbus_interface=DBUS_IFACE_CRED_NAME,
9
563
                         in_signature='s', out_signature='')
10
564
    def clear_token(self, app_name):
11
565
        """Clear the token for an application from the keyring.
12
566
13
567
        'app_name' is the name of the application.
14
568
        """
15
569
        try:
16
570
            creds = Keyring(app_name)
17
571
            creds.delete_ubuntusso_attr()
18
572
        except Exception:
19
573
            logger.exception(
20
574
                "problem removing credentials from keyring for %s",
21
575
                app_name)
22
576
23
562
577
24
563
class LoginProcessor:
578
class LoginProcessor:
25
564
    """Actually do the work of processing passed parameters."""
579
    """Actually do the work of processing passed parameters."""
26
565
580
27
=== modified file 'ubuntu_sso/tests/test_main.py'
28
--- ubuntu_sso/tests/test_main.py	2010-08-23 19:23:40 +0000
29
+++ ubuntu_sso/tests/test_main.py	2010-08-24 13:07:56 +0000
30
@@ -26,7 +26,7 @@
31
26
import gobject
26
import gobject
32
27
27
33
28
from lazr.restfulclient.errors import HTTPError
28
from lazr.restfulclient.errors import HTTPError
35
29
from mocker import Mocker, MockerTestCase, ARGS, KWARGS
29
from mocker import Mocker, MockerTestCase, ARGS, KWARGS, ANY
36
30
from twisted.internet.defer import Deferred
30
from twisted.internet.defer import Deferred
37
31
from twisted.trial.unittest import TestCase
31
from twisted.trial.unittest import TestCase
38
32
32
39
@@ -959,6 +959,30 @@
40
959
        client.login_to_get_credentials(*LOGIN_ONLY_ARGS)
959
        client.login_to_get_credentials(*LOGIN_ONLY_ARGS)
41
960
        return d
960
        return d
42
961
961
43
962
    def test_clear_token(self):
44
963
        """Check that clear_token tries removing the correct token."""
45
964
        mockKeyringClass = self.mocker.replace("ubuntu_sso.keyring.Keyring")
46
965
        mockKeyringClass(APP_NAME)
47
966
        mockKeyring = self.mocker.mock()
48
967
        self.mocker.result(mockKeyring)
49
968
        mockKeyring.delete_ubuntusso_attr()
50
969
        self.mocker.replay()
51
970
52
971
        client = SSOCredentials(self.mocker.mock())
53
972
        client.clear_token(APP_NAME)
54
973
55
974
    def test_clear_token_failed(self):
56
975
        """Check that clear_token fails correctly."""
57
976
        mockKeyringClass = self.mocker.replace("ubuntu_sso.keyring.Keyring")
58
977
        mockKeyringClass(APP_NAME)
59
978
        self.mocker.throw(self.mocker.mock())
60
979
        fake_logger = self.mocker.replace("ubuntu_sso.main.logger")
61
980
        fake_logger.exception(ANY, APP_NAME)
62
981
        self.mocker.replay()
63
982
64
983
        client = SSOCredentials(self.mocker.mock())
65
984
        client.clear_token(APP_NAME)
66
985
67
962
    def test_login_error_cb(self):
986
    def test_login_error_cb(self):
68
963
        """The login error callback should throw the signal."""
987
        """The login error callback should throw the signal."""
69
964
        d = Deferred()
988
        d = Deferred()
Reviewer	Date Requested	Status
Alejandro J. Cura (community)		Approve on 2010-08-24
Natalia Bidart (community)	2010-08-23	Approve on 2010-08-24
Review via email: mp+33431@code.launchpad.net