1
=== modified file 'desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py'
2
--- desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py	2010-12-17 15:59:00 +0000
3
+++ desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py	2011-01-03 17:31:11 +0000
4
@@ -18,30 +18,29 @@
5
18
18
6
19
"""Tests for the Ubuntu One pairing."""
19
"""Tests for the Ubuntu One pairing."""
7
20
20
8
21
import ubuntu_sso
9
21
22
12
22
import testtools
23
from mocker import MockerTestCase
11
23
from mocker import Mocker
13
24
24
14
25
from desktopcouch.application.plugins import ubuntuone_pairing as uone
25
from desktopcouch.application.plugins import ubuntuone_pairing as uone
15
26
from desktopcouch.application.plugins.ubuntuone_pairing import (
26
from desktopcouch.application.plugins.ubuntuone_pairing import (
16
27
    pair_with_ubuntuone, U1_PAIR_RECORD, MAP_JS)
27
    pair_with_ubuntuone, U1_PAIR_RECORD, MAP_JS)
17
28
28
18
29
29
20
30
class TestUbuntonePairing(testtools.TestCase):
30
class TestUbuntonePairing(MockerTestCase):
21
31
    """Tests for Ubuntu One Pairing."""
31
    """Tests for Ubuntu One Pairing."""
22
32
32
23
33
    def setUp(self):
33
    def setUp(self):
24
34
        """setup each test"""
34
        """setup each test"""
25
35
        super(TestUbuntonePairing, self).setUp()
35
        super(TestUbuntonePairing, self).setUp()
26
36
        # set a number of mocks that are used in all tests
36
        # set a number of mocks that are used in all tests
27
37
        self.mocker = Mocker()
28
38
        self.couchdb = self.mocker.mock()
37
        self.couchdb = self.mocker.mock()
29
39
        self.put_static_paired_service = self.mocker.replace(
38
        self.put_static_paired_service = self.mocker.replace(
30
40
            'desktopcouch.application.pair.couchdb_pairing.couchdb_io.' +
39
            'desktopcouch.application.pair.couchdb_pairing.couchdb_io.' +
31
41
            'put_static_paired_service')
40
            'put_static_paired_service')
32
42
41
33
43
    def test_pair_with_ubuntuone_no_view(self):
42
    def test_pair_with_ubuntuone_no_view(self):
35
44
        """Tests that when the view is not present it is indeed created."""
43
        """Test that when the view is not present it is indeed created."""
36
45
        self.couchdb.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD)
44
        self.couchdb.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD)
37
46
        self.mocker.result(False)
45
        self.mocker.result(False)
38
47
        # we are interested in the fact that the view is created
46
        # we are interested in the fact that the view is created
39
@@ -100,13 +99,11 @@
40
100
        self.mocker.verify()
99
        self.mocker.verify()
41
101
100
42
102
101
44
103
class TestUbuntuOnePlugin(testtools.TestCase):
102
class TestUbuntuOnePlugin(MockerTestCase):
45
104
    """Test the signal handling in the plug-in."""
103
    """Test the signal handling in the plug-in."""
46
105
104
47
106
    def setUp(self):
105
    def setUp(self):
48
107
        super(TestUbuntuOnePlugin, self).setUp()
106
        super(TestUbuntuOnePlugin, self).setUp()
49
108
        self.mocker = Mocker()
50
109
        self._bus = self.mocker.mock()
51
110
        self.called = False
107
        self.called = False
52
111
108
53
112
    def test_got_new_credentials_other(self):
109
    def test_got_new_credentials_other(self):
54
@@ -131,4 +128,30 @@
55
131
128
56
132
    def test_listen_to_dbus(self):
129
    def test_listen_to_dbus(self):
57
133
        """Test that listening to credentails works."""
130
        """Test that listening to credentails works."""
59
134
        uone.listen_to_dbus(bus=self._bus)
131
        session_class = self.mocker.replace("dbus.SessionBus")
60
132
        iface_class = self.mocker.replace("dbus.Interface")
61
133
62
134
        session_class()
63
135
        bus = self.mocker.mock()
64
136
        self.mocker.result(bus)
65
137
66
138
        iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
67
139
        bus.add_signal_receiver(handler_function=uone.got_new_credentials,
68
140
                                signal_name='CredentialsFound',
69
141
                                dbus_interface=iface)
70
142
71
143
        bus.get_object(ubuntu_sso.DBUS_BUS_NAME,
72
144
                       ubuntu_sso.DBUS_CREDENTIALS_PATH,
73
145
                       follow_name_owner_changes=True)
74
146
        an_obj = self.mocker.mock()
75
147
        self.mocker.result(an_obj)
76
148
77
149
        iface_class(an_obj, dbus_interface=iface)
78
150
        sso_backend = self.mocker.mock()
79
151
        self.mocker.result(sso_backend)
80
152
81
153
        sso_backend.find_credentials(uone.APP_NAME, {})
82
154
83
155
        self.mocker.replay()
84
156
85
157
        uone.listen_to_dbus()
86
135
158
87
=== modified file 'desktopcouch/application/plugins/ubuntuone_pairing.py'
88
--- desktopcouch/application/plugins/ubuntuone_pairing.py	2010-12-17 15:59:00 +0000
89
+++ desktopcouch/application/plugins/ubuntuone_pairing.py	2011-01-03 17:31:11 +0000
90
@@ -70,17 +70,25 @@
91
70
        pair_with_ubuntuone()
70
        pair_with_ubuntuone()
92
71
71
93
72
72
95
73
def listen_to_dbus(bus=None):
73
def listen_to_dbus():
96
74
    """Set up the signal handler on D-Bus for Ubuntu One pairing."""
74
    """Set up the signal handler on D-Bus for Ubuntu One pairing."""
100
75
    if not bus:
75
    import dbus
101
76
        import dbus
76
    bus = dbus.SessionBus()
99
77
        bus = dbus.SessionBus()
102
78
77
103
79
    try:
78
    try:
105
80
        from ubuntu_sso import DBUS_IFACE_CRED_NAME
79
        import ubuntu_sso
106
80
107
81
        iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
108
81
        bus.add_signal_receiver(handler_function=got_new_credentials,
82
        bus.add_signal_receiver(handler_function=got_new_credentials,
109
82
                                signal_name='CredentialsFound',
83
                                signal_name='CredentialsFound',
111
83
                                dbus_interface=DBUS_IFACE_CRED_NAME)
84
                                dbus_interface=iface)
112
85
113
86
        obj = bus.get_object(ubuntu_sso.DBUS_BUS_NAME,
114
87
                             ubuntu_sso.DBUS_CREDENTIALS_PATH,
115
88
                             follow_name_owner_changes=True)
116
89
        sso_backend = dbus.Interface(obj, dbus_interface=iface)
117
90
        sso_backend.find_credentials(APP_NAME, {})
118
91
119
84
    except ImportError:
92
    except ImportError:
120
85
        logging.info('Ubuntu SSO is not available.')
93
        logging.info('Ubuntu SSO is not available.')
121
86
94
Reviewer	Date Requested	Status
Samuele Pedroni		Approve on 2011-01-03
dobey (community)	2011-01-03	Approve on 2011-01-03
Review via email: mp+45032@code.launchpad.net