Merge lp:~coreygoldberg/autopilot/deps-remove-py33-mock into lp:~autopilot/autopilot/temp-dev

Proposed by Corey Goldberg
Status: Merged
Approved by: Corey Goldberg
Approved revision: 511
Merged at revision: 516
Proposed branch: lp:~coreygoldberg/autopilot/deps-remove-py33-mock
Merge into: lp:~autopilot/autopilot/temp-dev
Diff against target: 381 lines (+29/-31)
28 files modified
autopilot/tests/functional/test_input_stack.py (+1/-1)
autopilot/tests/functional/test_mouse_emulator.py (+1/-1)
autopilot/tests/unit/test_application_environment.py (+1/-1)
autopilot/tests/unit/test_application_launcher.py (+1/-1)
autopilot/tests/unit/test_command_line_args.py (+1/-1)
autopilot/tests/unit/test_config.py (+1/-1)
autopilot/tests/unit/test_content.py (+1/-1)
autopilot/tests/unit/test_debug.py (+1/-1)
autopilot/tests/unit/test_input.py (+1/-1)
autopilot/tests/unit/test_introspection.py (+1/-1)
autopilot/tests/unit/test_introspection_backends.py (+1/-1)
autopilot/tests/unit/test_introspection_dbus.py (+1/-1)
autopilot/tests/unit/test_introspection_object_registry.py (+1/-1)
autopilot/tests/unit/test_introspection_search.py (+1/-1)
autopilot/tests/unit/test_platform.py (+1/-1)
autopilot/tests/unit/test_process.py (+1/-1)
autopilot/tests/unit/test_query_resolution.py (+1/-1)
autopilot/tests/unit/test_run.py (+1/-1)
autopilot/tests/unit/test_start_final_events.py (+1/-1)
autopilot/tests/unit/test_test_fixtures.py (+1/-1)
autopilot/tests/unit/test_test_loader.py (+1/-1)
autopilot/tests/unit/test_testcase.py (+1/-1)
autopilot/tests/unit/test_testresults.py (+1/-1)
autopilot/tests/unit/test_types.py (+1/-1)
autopilot/tests/unit/test_utilities.py (+1/-1)
autopilot/tests/unit/test_version_utility_fns.py (+1/-1)
autopilot/tests/unit/test_vis_bus_enumerator.py (+1/-1)
debian/control (+2/-4)
To merge this branch: bzr merge lp:~coreygoldberg/autopilot/deps-remove-py33-mock
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Thomi Richards (community) Approve
Review via email: mp+220205@code.launchpad.net

Commit message

bump python version to 3.4 and remove python3-mock dependency

Description of the change

- bump python version to 3.4, since it is what shipped in Trusty
- remove python3-mock, since mock is included in python 3.4
- change importw from 'mock' to 'unittest.mock'

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/378
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/673
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/673/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6604
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7380

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-temp-dev-ci/82/rebuild

review: Approve (continuous-integration)
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
511. By Corey Goldberg

updated mock to unittest.mock

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/tests/functional/test_input_stack.py'
2--- autopilot/tests/functional/test_input_stack.py 2014-05-22 06:35:09 +0000
3+++ autopilot/tests/functional/test_input_stack.py 2014-05-23 11:28:40 +0000
4@@ -26,7 +26,7 @@
5 from textwrap import dedent
6 from time import sleep
7 from unittest import SkipTest
8-from mock import patch
9+from unittest.mock import patch
10
11 from autopilot.display import Display
12 from autopilot import platform
13
14=== modified file 'autopilot/tests/functional/test_mouse_emulator.py'
15--- autopilot/tests/functional/test_mouse_emulator.py 2014-02-03 04:32:54 +0000
16+++ autopilot/tests/functional/test_mouse_emulator.py 2014-05-23 11:28:40 +0000
17@@ -19,7 +19,7 @@
18
19 from testtools import skipIf, TestCase
20 from testtools.matchers import Equals
21-from mock import patch
22+from unittest.mock import patch
23
24 from autopilot import platform
25 from autopilot.input import Pointer, Mouse
26
27=== modified file 'autopilot/tests/unit/test_application_environment.py'
28--- autopilot/tests/unit/test_application_environment.py 2014-03-18 01:11:18 +0000
29+++ autopilot/tests/unit/test_application_environment.py 2014-05-23 11:28:40 +0000
30@@ -17,7 +17,7 @@
31 # along with this program. If not, see <http://www.gnu.org/licenses/>.
32 #
33
34-from mock import patch
35+from unittest.mock import patch
36 from testtools import TestCase
37 from testtools.matchers import raises
38
39
40=== modified file 'autopilot/tests/unit/test_application_launcher.py'
41--- autopilot/tests/unit/test_application_launcher.py 2014-04-22 22:00:25 +0000
42+++ autopilot/tests/unit/test_application_launcher.py 2014-05-23 11:28:40 +0000
43@@ -39,7 +39,7 @@
44 )
45 from testtools.content import text_content
46 import tempfile
47-from mock import Mock, patch
48+from unittest.mock import Mock, patch
49
50 from autopilot.application import (
51 ClickApplicationLauncher,
52
53=== modified file 'autopilot/tests/unit/test_command_line_args.py'
54--- autopilot/tests/unit/test_command_line_args.py 2014-05-20 14:43:24 +0000
55+++ autopilot/tests/unit/test_command_line_args.py 2014-05-23 11:28:40 +0000
56@@ -22,7 +22,7 @@
57 "Unit tests for the command line parser in autopilot."
58
59
60-from mock import patch
61+from unittest.mock import patch
62
63 try:
64 # Python 2
65
66=== modified file 'autopilot/tests/unit/test_config.py'
67--- autopilot/tests/unit/test_config.py 2014-05-21 07:42:24 +0000
68+++ autopilot/tests/unit/test_config.py 2014-05-23 11:28:40 +0000
69@@ -16,7 +16,7 @@
70 # You should have received a copy of the GNU General Public License
71 # along with this program. If not, see <http://www.gnu.org/licenses/>.
72 #
73-from mock import patch
74+from unittest.mock import patch
75 from testtools import TestCase
76
77 from autopilot import _config as config
78
79=== modified file 'autopilot/tests/unit/test_content.py'
80--- autopilot/tests/unit/test_content.py 2014-03-25 14:42:25 +0000
81+++ autopilot/tests/unit/test_content.py 2014-05-23 11:28:40 +0000
82@@ -19,7 +19,7 @@
83
84 from tempfile import NamedTemporaryFile
85
86-from mock import Mock, patch
87+from unittest.mock import Mock, patch
88 import os
89 from testtools import TestCase
90 from testtools.matchers import Contains, Equals, Not, Raises
91
92=== modified file 'autopilot/tests/unit/test_debug.py'
93--- autopilot/tests/unit/test_debug.py 2014-02-11 23:28:34 +0000
94+++ autopilot/tests/unit/test_debug.py 2014-05-23 11:28:40 +0000
95@@ -19,7 +19,7 @@
96
97 from autopilot import _debug as d
98
99-from mock import Mock, patch
100+from unittest.mock import Mock, patch
101 import six
102 from tempfile import NamedTemporaryFile
103 from testtools import TestCase
104
105=== modified file 'autopilot/tests/unit/test_input.py'
106--- autopilot/tests/unit/test_input.py 2014-04-07 23:25:11 +0000
107+++ autopilot/tests/unit/test_input.py 2014-05-23 11:28:40 +0000
108@@ -19,7 +19,7 @@
109
110 import testscenarios
111 from evdev import ecodes, uinput
112-from mock import ANY, call, Mock, patch
113+from unittest.mock import ANY, call, Mock, patch
114 from testtools import TestCase
115 from testtools.matchers import Contains, raises
116
117
118=== modified file 'autopilot/tests/unit/test_introspection.py'
119--- autopilot/tests/unit/test_introspection.py 2014-05-01 23:10:55 +0000
120+++ autopilot/tests/unit/test_introspection.py 2014-05-23 11:28:40 +0000
121@@ -18,7 +18,7 @@
122 #
123
124 from dbus import String
125-from mock import Mock
126+from unittest.mock import Mock
127 from testtools import TestCase
128 from testtools.matchers import (
129 Equals,
130
131=== modified file 'autopilot/tests/unit/test_introspection_backends.py'
132--- autopilot/tests/unit/test_introspection_backends.py 2014-05-01 03:06:11 +0000
133+++ autopilot/tests/unit/test_introspection_backends.py 2014-05-23 11:28:40 +0000
134@@ -18,7 +18,7 @@
135 #
136
137 from dbus import String
138-from mock import patch, MagicMock, Mock
139+from unittest.mock import patch, MagicMock, Mock
140 from testtools import TestCase
141 from testtools.matchers import Equals, Not, NotEquals, IsInstance
142
143
144=== modified file 'autopilot/tests/unit/test_introspection_dbus.py'
145--- autopilot/tests/unit/test_introspection_dbus.py 2014-05-01 23:10:55 +0000
146+++ autopilot/tests/unit/test_introspection_dbus.py 2014-05-23 11:28:40 +0000
147@@ -22,7 +22,7 @@
148 import shutil
149 import os.path
150
151-from mock import patch, Mock
152+from unittest.mock import patch, Mock
153 from six import StringIO
154 from textwrap import dedent
155 from testtools import TestCase
156
157=== modified file 'autopilot/tests/unit/test_introspection_object_registry.py'
158--- autopilot/tests/unit/test_introspection_object_registry.py 2014-05-05 23:25:40 +0000
159+++ autopilot/tests/unit/test_introspection_object_registry.py 2014-05-23 11:28:40 +0000
160@@ -19,7 +19,7 @@
161
162 from __future__ import absolute_import
163
164-from mock import patch
165+from unittest.mock import patch
166 from testtools import TestCase
167 from testtools.matchers import (
168 Equals,
169
170=== modified file 'autopilot/tests/unit/test_introspection_search.py'
171--- autopilot/tests/unit/test_introspection_search.py 2014-05-07 22:53:41 +0000
172+++ autopilot/tests/unit/test_introspection_search.py 2014-05-23 11:28:40 +0000
173@@ -19,7 +19,7 @@
174
175 from dbus import DBusException
176 import os
177-from mock import patch, Mock
178+from unittest.mock import patch, Mock
179 from six import u
180 from testtools import TestCase
181 from testtools.matchers import (
182
183=== modified file 'autopilot/tests/unit/test_platform.py'
184--- autopilot/tests/unit/test_platform.py 2014-01-27 22:23:58 +0000
185+++ autopilot/tests/unit/test_platform.py 2014-05-23 11:28:40 +0000
186@@ -28,7 +28,7 @@
187 # Python 3
188 from io import StringIO
189
190-from mock import patch
191+from unittest.mock import patch
192 from testtools import TestCase
193 from testtools.matchers import Equals
194 from tempfile import NamedTemporaryFile
195
196=== modified file 'autopilot/tests/unit/test_process.py'
197--- autopilot/tests/unit/test_process.py 2014-04-23 22:28:11 +0000
198+++ autopilot/tests/unit/test_process.py 2014-05-23 11:28:40 +0000
199@@ -18,7 +18,7 @@
200 #
201
202 from gi.repository import GLib
203-from mock import Mock, patch
204+from unittest.mock import Mock, patch
205 from testtools import TestCase, skipIf
206 from testtools.matchers import (
207 Not,
208
209=== modified file 'autopilot/tests/unit/test_query_resolution.py'
210--- autopilot/tests/unit/test_query_resolution.py 2014-02-11 05:06:25 +0000
211+++ autopilot/tests/unit/test_query_resolution.py 2014-05-23 11:28:40 +0000
212@@ -21,7 +21,7 @@
213 from testtools.matchers import raises
214 from testscenarios import WithScenarios
215 from textwrap import dedent
216-from mock import patch
217+from unittest.mock import patch
218
219 from autopilot.display import _upa as upa
220
221
222=== modified file 'autopilot/tests/unit/test_run.py'
223--- autopilot/tests/unit/test_run.py 2014-05-20 14:43:24 +0000
224+++ autopilot/tests/unit/test_run.py 2014-05-23 11:28:40 +0000
225@@ -18,7 +18,7 @@
226 #
227
228 from argparse import Namespace
229-from mock import Mock, patch
230+from unittest.mock import Mock, patch
231 import logging
232 import os.path
233 from shutil import rmtree
234
235=== modified file 'autopilot/tests/unit/test_start_final_events.py'
236--- autopilot/tests/unit/test_start_final_events.py 2013-07-22 03:15:12 +0000
237+++ autopilot/tests/unit/test_start_final_events.py 2014-05-23 11:28:40 +0000
238@@ -20,7 +20,7 @@
239
240 from testtools import TestCase
241 from testtools.matchers import Equals, Contains
242-from mock import patch, Mock
243+from unittest.mock import patch, Mock
244
245 from autopilot.utilities import (
246 CleanupRegistered,
247
248=== modified file 'autopilot/tests/unit/test_test_fixtures.py'
249--- autopilot/tests/unit/test_test_fixtures.py 2014-03-17 00:53:15 +0000
250+++ autopilot/tests/unit/test_test_fixtures.py 2014-05-23 11:28:40 +0000
251@@ -25,7 +25,7 @@
252 import os
253 import os.path
254 import stat
255-from mock import patch
256+from unittest.mock import patch
257 from shutil import rmtree
258 import tempfile
259 from testtools import TestCase
260
261=== modified file 'autopilot/tests/unit/test_test_loader.py'
262--- autopilot/tests/unit/test_test_loader.py 2014-01-16 01:01:31 +0000
263+++ autopilot/tests/unit/test_test_loader.py 2014-05-23 11:28:40 +0000
264@@ -24,7 +24,7 @@
265 from testtools import TestCase
266 from testtools.matchers import Not, Raises
267 from contextlib import contextmanager
268-from mock import patch
269+from unittest.mock import patch
270 import shutil
271 import tempfile
272
273
274=== modified file 'autopilot/tests/unit/test_testcase.py'
275--- autopilot/tests/unit/test_testcase.py 2014-05-12 20:59:37 +0000
276+++ autopilot/tests/unit/test_testcase.py 2014-05-23 11:28:40 +0000
277@@ -16,7 +16,7 @@
278 # You should have received a copy of the GNU General Public License
279 # along with this program. If not, see <http://www.gnu.org/licenses/>.
280 #
281-from mock import call, Mock, patch
282+from unittest.mock import call, Mock, patch
283 from testtools import TestCase
284 from testtools.matchers import Contains, raises
285
286
287=== modified file 'autopilot/tests/unit/test_testresults.py'
288--- autopilot/tests/unit/test_testresults.py 2014-02-26 02:18:50 +0000
289+++ autopilot/tests/unit/test_testresults.py 2014-05-23 11:28:40 +0000
290@@ -18,7 +18,7 @@
291 #
292
293 import codecs
294-from mock import Mock
295+from unittest.mock import Mock
296 import os
297 import tempfile
298 from testtools import TestCase, PlaceHolder
299
300=== modified file 'autopilot/tests/unit/test_types.py'
301--- autopilot/tests/unit/test_types.py 2014-05-15 20:59:53 +0000
302+++ autopilot/tests/unit/test_types.py 2014-05-23 11:28:40 +0000
303@@ -20,7 +20,7 @@
304 from __future__ import absolute_import
305
306 from datetime import datetime, time
307-from mock import patch, Mock
308+from unittest.mock import patch, Mock
309 import six
310 from testscenarios import TestWithScenarios
311 from testtools import TestCase
312
313=== modified file 'autopilot/tests/unit/test_utilities.py'
314--- autopilot/tests/unit/test_utilities.py 2014-04-22 20:02:01 +0000
315+++ autopilot/tests/unit/test_utilities.py 2014-05-23 11:28:40 +0000
316@@ -17,7 +17,7 @@
317 # along with this program. If not, see <http://www.gnu.org/licenses/>.
318 #
319
320-from mock import Mock, patch
321+from unittest.mock import Mock, patch
322 import re
323 import six
324 from testtools import skipIf, TestCase
325
326=== modified file 'autopilot/tests/unit/test_version_utility_fns.py'
327--- autopilot/tests/unit/test_version_utility_fns.py 2014-03-19 19:25:29 +0000
328+++ autopilot/tests/unit/test_version_utility_fns.py 2014-05-23 11:28:40 +0000
329@@ -17,7 +17,7 @@
330 # along with this program. If not, see <http://www.gnu.org/licenses/>.
331 #
332
333-from mock import patch
334+from unittest.mock import patch
335 import subprocess
336 from testtools import TestCase
337 from testtools.matchers import Equals
338
339=== modified file 'autopilot/tests/unit/test_vis_bus_enumerator.py'
340--- autopilot/tests/unit/test_vis_bus_enumerator.py 2014-04-23 22:33:05 +0000
341+++ autopilot/tests/unit/test_vis_bus_enumerator.py 2014-05-23 11:28:40 +0000
342@@ -18,7 +18,7 @@
343 #
344
345
346-from mock import patch, Mock
347+from unittest.mock import patch, Mock
348 from testtools import TestCase, skipUnless
349 from textwrap import dedent
350
351
352=== modified file 'debian/control'
353--- debian/control 2014-05-15 08:31:35 +0000
354+++ debian/control 2014-05-23 11:28:40 +0000
355@@ -12,16 +12,15 @@
356 gir1.2-upstart-app-launch-2,
357 graphviz,
358 libjs-jquery,
359- libjs-underscore,
360+ libjs-underscore,
361 liblttng-ust-dev,
362- python3-all-dev (>= 3.3),
363+ python3-all-dev (>= 3.4),
364 python3-dbus,
365 python3-decorator,
366 python3-evdev,
367 python3-fixtures,
368 python3-gi,
369 python3-junitxml,
370- python3-mock,
371 python3-psutil,
372 python3-setuptools,
373 python3-six,
374@@ -135,7 +134,6 @@
375 libautopilot-qt (>= 1.4),
376 python3-autopilot,
377 python3-evdev,
378- python3-mock,
379 python3-pyqt4,
380 python-windowmocker,
381 qmlscene,

Subscribers

People subscribed via source and target branches