1
=== modified file 'debian/control'
2
--- debian/control	2014-05-26 12:56:47 +0000
3
+++ debian/control	2014-07-22 13:09:58 +0000
4
@@ -16,8 +16,11 @@
5
16
               libgtest-dev,
16
               libgtest-dev,
6
17
               libsqlite3-dev,
17
               libsqlite3-dev,
7
18
               libubuntu-app-launch2-dev (>= 0.3),
18
               libubuntu-app-launch2-dev (>= 0.3),
9
19
               python,
19
               python3,
10
20
               python3-dbusmock,
20
               python3-dbusmock,
11
21
               python3-fixtures,
12
22
               python3-nose,
13
23
               python3-testtools,
14
21
               sqlite3,
24
               sqlite3,
15
22
Standards-Version: 3.9.4
25
Standards-Version: 3.9.4
16
23
Homepage: http://launchpad.net/url-dispatcher
26
Homepage: http://launchpad.net/url-dispatcher
17
@@ -83,3 +86,10 @@
18
83
 starting them inside its own Application Confinement.
86
 starting them inside its own Application Confinement.
19
84
 .
87
 .
20
85
 This package contains files that are needed to build applications.
88
 This package contains files that are needed to build applications.
21
89
22
90
Package: url-dispatcher-testability
23
91
Architecture: all
24
92
Depends: ${misc:Depends},
25
93
         python3-dbusmock,
26
94
         python3-dbus,
27
95
Description: A fake URL dispatcher for use in testing.
28
86
96
29
=== modified file 'debian/rules'
30
--- debian/rules	2014-06-06 16:06:24 +0000
31
+++ debian/rules	2014-07-22 13:09:58 +0000
32
@@ -12,4 +12,3 @@
33
12
	mkdir -p debian/url-dispatcher/etc/apport/crashdb.conf.d/
12
	mkdir -p debian/url-dispatcher/etc/apport/crashdb.conf.d/
34
13
	install -m 644 debian/url-dispatcher-crashdb.conf debian/url-dispatcher/etc/apport/crashdb.conf.d/
13
	install -m 644 debian/url-dispatcher-crashdb.conf debian/url-dispatcher/etc/apport/crashdb.conf.d/
35
14
	dh_install --fail-missing
14
	dh_install --fail-missing
36
15
37
16
15
38
=== added file 'debian/url-dispatcher-testability.install'
39
--- debian/url-dispatcher-testability.install	1970-01-01 00:00:00 +0000
40
+++ debian/url-dispatcher-testability.install	2014-07-22 13:09:58 +0000
41
@@ -0,0 +1,1 @@
42
1
/usr/lib/python*/dist-packages/url_dispatcher_testability/*
43
0
2
44
=== modified file 'tests/CMakeLists.txt'
45
--- tests/CMakeLists.txt	2014-05-26 13:09:00 +0000
46
+++ tests/CMakeLists.txt	2014-07-22 13:09:58 +0000
47
@@ -131,4 +131,4 @@
48
131
	${GTEST_LIBS})
131
	${GTEST_LIBS})
49
132
132
50
133
add_test (url-db-test url-db-test)
133
add_test (url-db-test url-db-test)
52
134
134
add_subdirectory(url_dispatcher_testability)
53
135
135
54
=== added directory 'tests/url_dispatcher_testability'
55
=== added file 'tests/url_dispatcher_testability/CMakeLists.txt'
56
--- tests/url_dispatcher_testability/CMakeLists.txt	1970-01-01 00:00:00 +0000
57
+++ tests/url_dispatcher_testability/CMakeLists.txt	2014-07-22 13:09:58 +0000
58
@@ -0,0 +1,13 @@
59
1
execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
60
2
    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
61
3
62
4
install(FILES fixture_setup.py fake_dispatcher.py test_fake_dispatcher.py
63
5
    DESTINATION ${PYTHON_PACKAGE_DIR}/url_dispatcher_testability
64
6
)
65
7
66
8
configure_file(
67
9
  "${PROJECT_SOURCE_DIR}/tests/url_dispatcher_testability/test_fake_dispatcher.py.in"
68
10
  "${PROJECT_SOURCE_DIR}/tests/url_dispatcher_testability/test_fake_dispatcher.py"
69
11
  )
70
12
71
13
add_test(fake-dispatcher dbus-launch --exit-with-session nosetests3 ${PROJECT_SOURCE_DIR}/tests/url_dispatcher_testability/test_fake_dispatcher.py)
72
0
14
73
=== added file 'tests/url_dispatcher_testability/__init__.py'
74
=== added file 'tests/url_dispatcher_testability/fake_dispatcher.py'
75
--- tests/url_dispatcher_testability/fake_dispatcher.py	1970-01-01 00:00:00 +0000
76
+++ tests/url_dispatcher_testability/fake_dispatcher.py	2014-07-22 13:09:58 +0000
77
@@ -0,0 +1,67 @@
78
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
79
2
#
80
3
# Copyright (C) 2014 Canonical Ltd.
81
4
#
82
5
# This program is free software; you can redistribute it and/or modify
83
6
# it under the terms of the GNU Lesser General Public License as published by
84
7
# the Free Software Foundation; version 3.
85
8
#
86
9
# This program is distributed in the hope that it will be useful,
87
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
88
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
89
12
# GNU Lesser General Public License for more details.
90
13
#
91
14
# You should have received a copy of the GNU Lesser General Public License
92
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
93
16
94
17
import dbus
95
18
import dbusmock
96
19
import subprocess
97
20
98
21
99
22
class FakeDispatcherException(Exception):
100
23
    pass
101
24
102
25
103
26
class FakeURLDispatcherService:
104
27
105
28
    """Fake URL Dispatcher service using a dbusmock interface."""
106
29
107
30
    def __init__(self):
108
31
        super(FakeURLDispatcherService, self).__init__()
109
32
        self.dbus_connection = dbusmock.DBusTestCase.get_dbus(system_bus=False)
110
33
111
34
    def start(self):
112
35
        """Start the fake URL Dispatcher service."""
113
36
        # Stop the real url-dispatcher.
114
37
        subprocess.call(['initctl', 'stop', 'url-dispatcher'])
115
38
        self.dbus_mock_server = dbusmock.DBusTestCase.spawn_server(
116
39
            'com.canonical.URLDispatcher',
117
40
            '/com/canonical/URLDispatcher',
118
41
            'com.canonical.URLDispatcher',
119
42
            system_bus=False,
120
43
            stdout=subprocess.PIPE)
121
44
        self.mock = self._get_mock_interface()
122
45
        self.mock.AddMethod(
123
46
            'com.canonical.URLDispatcher', 'DispatchURL', 'ss', '', '')
124
47
125
48
    def _get_mock_interface(self):
126
49
        return dbus.Interface(
127
50
            self.dbus_connection.get_object(
128
51
                'com.canonical.URLDispatcher',
129
52
                '/com/canonical/URLDispatcher'),
130
53
            dbusmock.MOCK_IFACE)
131
54
132
55
    def stop(self):
133
56
        """Stop the fake URL Dispatcher service."""
134
57
        self.dbus_mock_server.terminate()
135
58
        self.dbus_mock_server.wait()
136
59
137
60
    def get_last_dispatch_url_call_parameter(self):
138
61
        """Return the parameter used in the last call to dispatch URL."""
139
62
        calls = self.mock.GetCalls()
140
63
        if len(calls) == 0:
141
64
            raise FakeDispatcherException(
142
65
                'URL dispatcher has not been called.')
143
66
        last_call = self.mock.GetCalls()[-1]
144
67
        return last_call[2][0]
145
0
68
146
=== added file 'tests/url_dispatcher_testability/fixture_setup.py'
147
--- tests/url_dispatcher_testability/fixture_setup.py	1970-01-01 00:00:00 +0000
148
+++ tests/url_dispatcher_testability/fixture_setup.py	2014-07-22 13:09:58 +0000
149
@@ -0,0 +1,30 @@
150
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
151
2
#
152
3
# Copyright (C) 2014 Canonical Ltd.
153
4
#
154
5
# This program is free software; you can redistribute it and/or modify
155
6
# it under the terms of the GNU Lesser General Public License as published by
156
7
# the Free Software Foundation; version 3.
157
8
#
158
9
# This program is distributed in the hope that it will be useful,
159
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
160
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
161
12
# GNU Lesser General Public License for more details.
162
13
#
163
14
# You should have received a copy of the GNU Lesser General Public License
164
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
165
16
166
17
import fixtures
167
18
from url_dispatcher_testability import fake_dispatcher
168
19
169
20
170
21
class FakeURLDispatcher(fixtures.Fixture):
171
22
172
23
    def setUp(self):
173
24
        super(FakeURLDispatcher, self).setUp()
174
25
        self.fake_service = fake_dispatcher.FakeURLDispatcherService()
175
26
        self.addCleanup(self.fake_service.stop)
176
27
        self.fake_service.start()
177
28
178
29
    def get_last_dispatch_url_call_parameter(self):
179
30
        return self.fake_service.get_last_dispatch_url_call_parameter()
180
0
31
181
=== added file 'tests/url_dispatcher_testability/test_fake_dispatcher.py.in'
182
--- tests/url_dispatcher_testability/test_fake_dispatcher.py.in	1970-01-01 00:00:00 +0000
183
+++ tests/url_dispatcher_testability/test_fake_dispatcher.py.in	2014-07-22 13:09:58 +0000
184
@@ -0,0 +1,37 @@
185
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
186
2
#
187
3
# Copyright (C) 2014 Canonical Ltd.
188
4
#
189
5
# This program is free software; you can redistribute it and/or modify
190
6
# it under the terms of the GNU Lesser General Public License as published by
191
7
# the Free Software Foundation; version 3.
192
8
#
193
9
# This program is distributed in the hope that it will be useful,
194
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
195
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
196
12
# GNU Lesser General Public License for more details.
197
13
#
198
14
# You should have received a copy of the GNU Lesser General Public License
199
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
200
16
201
17
import testtools
202
18
from url_dispatcher_testability import fixture_setup, fake_dispatcher
203
19
204
20
from subprocess import call, CalledProcessError
205
21
206
22
207
23
class FakeDispatcherTestCase(testtools.TestCase):
208
24
209
25
    def setUp(self):
210
26
        super(FakeDispatcherTestCase, self).setUp()
211
27
        self.dispatcher = fixture_setup.FakeURLDispatcher()
212
28
        self.useFixture(self.dispatcher)
213
29
214
30
    def test_url_dispatcher(self):
215
31
        bin_dir = "@PROJECT_BINARY_DIR@"
216
32
        call([bin_dir + '/tools/url-dispatcher', 'test://testurl'])
217
33
        try:
218
34
            last_url = self.dispatcher.get_last_dispatch_url_call_parameter()
219
35
        except fake_dispatcher.FakeDispatcherException:
220
36
            last_url = None
221
37
        self.assertEqual(last_url, 'test://testurl')
Status:	Superseded
Proposed branch:	lp:~canonical-platform-qa/url-dispatcher/fake_dispatcher
Merge into:	lp:url-dispatcher/14.10
Diff against target:	221 lines (+160/-3) 8 files modified debian/control (+11/-1) debian/rules (+0/-1) debian/url-dispatcher-testability.install (+1/-0) tests/CMakeLists.txt (+1/-1) tests/url_dispatcher_testability/CMakeLists.txt (+13/-0) tests/url_dispatcher_testability/fake_dispatcher.py (+67/-0) tests/url_dispatcher_testability/fixture_setup.py (+30/-0) tests/url_dispatcher_testability/test_fake_dispatcher.py.in (+37/-0)
To merge this branch:	bzr merge lp:~canonical-platform-qa/url-dispatcher/fake_dispatcher
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-07-22
Ted Gould (community)		2014-07-15	Needs Fixing on 2014-07-16
Leo Arias (community)	code review	2014-07-15	Needs Fixing on 2014-07-15
Ubuntu Core Development Team		2014-07-15	Pending
Review via email: mp+226829@code.launchpad.net