curtin

Merge ~dbungert/curtin:mock-from-unittests into curtin:master

  1. Git
  2. lp:~dbungert/curtin
  3. mock-from-unittests
  4. Merge into master
Proposed by Dan Bungert
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: 517f04c35d79de2db6470795d1a7e73ffa79e30b
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~dbungert/curtin:mock-from-unittests
Merge into: curtin:master
Diff against target: 446 lines (+33/-40)
34 files modified
debian/control (+0/-1)
test-requirements.txt (+0/-1)
tests/unittests/helpers.py (+1/-1)
tests/unittests/test_apt_custom_sources_list.py (+2/-2)
tests/unittests/test_apt_source.py (+2/-2)
tests/unittests/test_block.py (+1/-1)
tests/unittests/test_block_bcache.py (+1/-1)
tests/unittests/test_block_iscsi.py (+1/-1)
tests/unittests/test_block_lvm.py (+1/-1)
tests/unittests/test_block_mdadm.py (+1/-1)
tests/unittests/test_block_mkfs.py (+1/-1)
tests/unittests/test_block_multipath.py (+1/-1)
tests/unittests/test_block_zfs.py (+1/-1)
tests/unittests/test_clear_holders.py (+1/-1)
tests/unittests/test_commands_apply_net.py (+1/-1)
tests/unittests/test_commands_block_meta.py (+1/-1)
tests/unittests/test_commands_collect_logs.py (+1/-1)
tests/unittests/test_commands_install.py (+1/-1)
tests/unittests/test_commands_install_grub.py (+1/-1)
tests/unittests/test_commands_net_meta.py (+1/-1)
tests/unittests/test_commands_unmount.py (+1/-1)
tests/unittests/test_curthooks.py (+1/-1)
tests/unittests/test_distro.py (+1/-1)
tests/unittests/test_gpg.py (+1/-1)
tests/unittests/test_make_dname.py (+1/-1)
tests/unittests/test_net.py (+1/-1)
tests/unittests/test_partitioning.py (+1/-1)
tests/unittests/test_reporter.py (+1/-1)
tests/unittests/test_swap.py (+1/-1)
tests/unittests/test_udev.py (+1/-1)
tests/unittests/test_url_helper.py (+1/-1)
tests/unittests/test_util.py (+1/-4)
tests/unittests/test_version.py (+1/-1)
tox.ini (+0/-2)
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+448305@code.launchpad.net

Commit message

unittest: use unittest.mock instead of mock

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:b45049f0d9768918ea7b1e57d437316f58fb9374
https://jenkins.canonical.com/server-team/job/curtin-ci/163/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/163/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/163/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/163/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/163/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/163//rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

You left an import it seems.

Can you remove mock from test-requirements.txt and tox.ini ?

Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:1db44283bd7467f1fdfd415553dc0b473d4f2eb3
https://jenkins.canonical.com/server-team/job/curtin-ci/165/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/165/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/165/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/165/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/165/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/165//rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Hudson-Doyle (mwhudson) :
review: Approve
~dbungert/curtin:mock-from-unittests updated
517f04c... by Dan Bungert

several: drop python3-mock

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index a35cbf6..34d350d 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 7),
6 python3-apt,
7 python3-attr,
8 python3-coverage,
9- python3-mock,
10 python3-nose,
11 python3-oauthlib,
12 python3-setuptools,
13diff --git a/test-requirements.txt b/test-requirements.txt
14index 0d93c02..487d7da 100644
15--- a/test-requirements.txt
16+++ b/test-requirements.txt
17@@ -2,7 +2,6 @@ pip
18 wheel
19 virtualenv
20 jsonschema
21-mock
22 nose
23 pyflakes
24 coverage
25diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
26index ffb2775..3e01b3a 100644
27--- a/tests/unittests/helpers.py
28+++ b/tests/unittests/helpers.py
29@@ -3,7 +3,7 @@
30 import imp
31 import importlib
32 import logging
33-import mock
34+from unittest import mock
35 import os
36 import random
37 import shutil
38diff --git a/tests/unittests/test_apt_custom_sources_list.py b/tests/unittests/test_apt_custom_sources_list.py
39index dafc478..e0d0c08 100644
40--- a/tests/unittests/test_apt_custom_sources_list.py
41+++ b/tests/unittests/test_apt_custom_sources_list.py
42@@ -7,8 +7,8 @@ import logging
43 import os
44 import yaml
45
46-import mock
47-from mock import call
48+from unittest import mock
49+from unittest.mock import call
50 import textwrap
51
52 from curtin import distro
53diff --git a/tests/unittests/test_apt_source.py b/tests/unittests/test_apt_source.py
54index 9a840c2..687e8a1 100644
55--- a/tests/unittests/test_apt_source.py
56+++ b/tests/unittests/test_apt_source.py
57@@ -9,8 +9,8 @@ import re
58 import socket
59
60
61-import mock
62-from mock import call
63+from unittest import mock
64+from unittest.mock import call
65
66 from aptsources.sourceslist import SourceEntry
67
68diff --git a/tests/unittests/test_block.py b/tests/unittests/test_block.py
69index bb7205e..1ef8f80 100644
70--- a/tests/unittests/test_block.py
71+++ b/tests/unittests/test_block.py
72@@ -3,7 +3,7 @@
73 import functools
74 import json
75 import os
76-import mock
77+from unittest import mock
78 import sys
79 import textwrap
80
81diff --git a/tests/unittests/test_block_bcache.py b/tests/unittests/test_block_bcache.py
82index 7936522..052466f 100644
83--- a/tests/unittests/test_block_bcache.py
84+++ b/tests/unittests/test_block_bcache.py
85@@ -1,4 +1,4 @@
86-import mock
87+from unittest import mock
88 import os
89
90 from curtin.block import bcache
91diff --git a/tests/unittests/test_block_iscsi.py b/tests/unittests/test_block_iscsi.py
92index f8ef5d8..2a55f81 100644
93--- a/tests/unittests/test_block_iscsi.py
94+++ b/tests/unittests/test_block_iscsi.py
95@@ -1,6 +1,6 @@
96 # This file is part of curtin. See LICENSE file for copyright and license info.
97
98-import mock
99+from unittest import mock
100 import os
101
102 from curtin.block import iscsi
103diff --git a/tests/unittests/test_block_lvm.py b/tests/unittests/test_block_lvm.py
104index 315281d..d096799 100644
105--- a/tests/unittests/test_block_lvm.py
106+++ b/tests/unittests/test_block_lvm.py
107@@ -3,7 +3,7 @@
108 from curtin.block import lvm
109
110 from .helpers import CiTestCase
111-import mock
112+from unittest import mock
113
114
115 class TestBlockLvm(CiTestCase):
116diff --git a/tests/unittests/test_block_mdadm.py b/tests/unittests/test_block_mdadm.py
117index 74396d8..9493102 100644
118--- a/tests/unittests/test_block_mdadm.py
119+++ b/tests/unittests/test_block_mdadm.py
120@@ -1,6 +1,6 @@
121 # This file is part of curtin. See LICENSE file for copyright and license info.
122
123-from mock import call, patch
124+from unittest.mock import call, patch
125 from curtin.block import dev_short
126 from curtin.block import mdadm
127 from curtin import util
128diff --git a/tests/unittests/test_block_mkfs.py b/tests/unittests/test_block_mkfs.py
129index 63c0acf..163cee6 100644
130--- a/tests/unittests/test_block_mkfs.py
131+++ b/tests/unittests/test_block_mkfs.py
132@@ -3,7 +3,7 @@
133 from curtin.block import mkfs
134
135 from .helpers import CiTestCase
136-import mock
137+from unittest import mock
138
139
140 class TestBlockMkfs(CiTestCase):
141diff --git a/tests/unittests/test_block_multipath.py b/tests/unittests/test_block_multipath.py
142index db767ab..7c938a0 100644
143--- a/tests/unittests/test_block_multipath.py
144+++ b/tests/unittests/test_block_multipath.py
145@@ -1,4 +1,4 @@
146-import mock
147+from unittest import mock
148
149 from curtin.block import multipath
150 from .helpers import CiTestCase
151diff --git a/tests/unittests/test_block_zfs.py b/tests/unittests/test_block_zfs.py
152index e392000..72cfd3f 100644
153--- a/tests/unittests/test_block_zfs.py
154+++ b/tests/unittests/test_block_zfs.py
155@@ -1,4 +1,4 @@
156-import mock
157+from unittest import mock
158
159 from curtin.config import merge_config
160 from curtin.block import zfs
161diff --git a/tests/unittests/test_clear_holders.py b/tests/unittests/test_clear_holders.py
162index 0cdd979..48715e0 100644
163--- a/tests/unittests/test_clear_holders.py
164+++ b/tests/unittests/test_clear_holders.py
165@@ -1,6 +1,6 @@
166 # This file is part of curtin. See LICENSE file for copyright and license info.
167
168-import mock
169+from unittest import mock
170 import os
171 import textwrap
172 import uuid
173diff --git a/tests/unittests/test_commands_apply_net.py b/tests/unittests/test_commands_apply_net.py
174index 04b7f2e..e9cd385 100644
175--- a/tests/unittests/test_commands_apply_net.py
176+++ b/tests/unittests/test_commands_apply_net.py
177@@ -1,6 +1,6 @@
178 # This file is part of curtin. See LICENSE file for copyright and license info.
179
180-from mock import patch, call
181+from unittest.mock import patch, call
182 import copy
183 import os
184
185diff --git a/tests/unittests/test_commands_block_meta.py b/tests/unittests/test_commands_block_meta.py
186index 028d04e..6388e0b 100644
187--- a/tests/unittests/test_commands_block_meta.py
188+++ b/tests/unittests/test_commands_block_meta.py
189@@ -3,7 +3,7 @@
190 from argparse import Namespace
191 from collections import OrderedDict
192 import copy
193-from mock import (
194+from unittest.mock import (
195 call,
196 Mock,
197 patch,
198diff --git a/tests/unittests/test_commands_collect_logs.py b/tests/unittests/test_commands_collect_logs.py
199index 2077719..3a56a59 100644
200--- a/tests/unittests/test_commands_collect_logs.py
201+++ b/tests/unittests/test_commands_collect_logs.py
202@@ -2,7 +2,7 @@ from collections import namedtuple
203 import copy
204 from datetime import datetime
205 import json
206-import mock
207+from unittest import mock
208 import os
209 from textwrap import dedent
210
211diff --git a/tests/unittests/test_commands_install.py b/tests/unittests/test_commands_install.py
212index 125e3d9..3c62c9c 100644
213--- a/tests/unittests/test_commands_install.py
214+++ b/tests/unittests/test_commands_install.py
215@@ -2,7 +2,7 @@
216
217 import copy
218 import json
219-import mock
220+from unittest import mock
221 import os
222
223 from curtin import config
224diff --git a/tests/unittests/test_commands_install_grub.py b/tests/unittests/test_commands_install_grub.py
225index fc19da3..8fbf12e 100644
226--- a/tests/unittests/test_commands_install_grub.py
227+++ b/tests/unittests/test_commands_install_grub.py
228@@ -7,7 +7,7 @@ from curtin import paths
229 from curtin.commands import install_grub
230 from .helpers import CiTestCase
231
232-import mock
233+from unittest import mock
234 import os
235
236
237diff --git a/tests/unittests/test_commands_net_meta.py b/tests/unittests/test_commands_net_meta.py
238index 76da74b..86dc036 100644
239--- a/tests/unittests/test_commands_net_meta.py
240+++ b/tests/unittests/test_commands_net_meta.py
241@@ -2,7 +2,7 @@
242
243 import os
244
245-from mock import MagicMock, call
246+from unittest.mock import MagicMock, call
247
248 from .helpers import CiTestCase, simple_mocked_open
249
250diff --git a/tests/unittests/test_commands_unmount.py b/tests/unittests/test_commands_unmount.py
251index 2ef6589..95d4dd3 100644
252--- a/tests/unittests/test_commands_unmount.py
253+++ b/tests/unittests/test_commands_unmount.py
254@@ -5,7 +5,7 @@ from curtin.util import FileMissingError
255 from .helpers import CiTestCase
256
257 import argparse
258-import mock
259+from unittest import mock
260 import os
261
262
263diff --git a/tests/unittests/test_curthooks.py b/tests/unittests/test_curthooks.py
264index a67bc81..0728260 100644
265--- a/tests/unittests/test_curthooks.py
266+++ b/tests/unittests/test_curthooks.py
267@@ -1,7 +1,7 @@
268 # This file is part of curtin. See LICENSE file for copyright and license info.
269
270 import os
271-from mock import call, patch
272+from unittest.mock import call, patch
273 import textwrap
274 from typing import Optional
275
276diff --git a/tests/unittests/test_distro.py b/tests/unittests/test_distro.py
277index 5743475..400b4ae 100644
278--- a/tests/unittests/test_distro.py
279+++ b/tests/unittests/test_distro.py
280@@ -1,7 +1,7 @@
281 # This file is part of curtin. See LICENSE file for copyright and license info.
282
283 from unittest import skipIf
284-import mock
285+from unittest import mock
286 import os
287 import sys
288
289diff --git a/tests/unittests/test_gpg.py b/tests/unittests/test_gpg.py
290index 42ff8c4..0d6c7eb 100644
291--- a/tests/unittests/test_gpg.py
292+++ b/tests/unittests/test_gpg.py
293@@ -1,6 +1,6 @@
294 # This file is part of curtin. See LICENSE file for copyright and license info.
295
296-from mock import call, patch
297+from unittest.mock import call, patch
298 import textwrap
299
300 from curtin import gpg
301diff --git a/tests/unittests/test_make_dname.py b/tests/unittests/test_make_dname.py
302index ec48339..1dc7da0 100644
303--- a/tests/unittests/test_make_dname.py
304+++ b/tests/unittests/test_make_dname.py
305@@ -1,6 +1,6 @@
306 # This file is part of curtin. See LICENSE file for copyright and license info.
307
308-import mock
309+from unittest import mock
310
311 import textwrap
312 import uuid
313diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
314index 449b3b6..157029c 100644
315--- a/tests/unittests/test_net.py
316+++ b/tests/unittests/test_net.py
317@@ -1,6 +1,6 @@
318 # This file is part of curtin. See LICENSE file for copyright and license info.
319
320-import mock
321+from unittest import mock
322 import os
323 import yaml
324
325diff --git a/tests/unittests/test_partitioning.py b/tests/unittests/test_partitioning.py
326index ac1ad79..50ff07c 100644
327--- a/tests/unittests/test_partitioning.py
328+++ b/tests/unittests/test_partitioning.py
329@@ -1,7 +1,7 @@
330 # This file is part of curtin. See LICENSE file for copyright and license info.
331
332 from unittest import skip
333-import mock
334+from unittest import mock
335 import curtin.commands.block_meta
336 from .helpers import CiTestCase
337
338diff --git a/tests/unittests/test_reporter.py b/tests/unittests/test_reporter.py
339index 09b8bcf..bce3e13 100644
340--- a/tests/unittests/test_reporter.py
341+++ b/tests/unittests/test_reporter.py
342@@ -6,7 +6,7 @@ from __future__ import (
343 unicode_literals,
344 )
345
346-from mock import patch
347+from unittest.mock import patch
348
349 from curtin.reporter.legacy import (
350 EmptyReporter,
351diff --git a/tests/unittests/test_swap.py b/tests/unittests/test_swap.py
352index d37d519..ffdc883 100644
353--- a/tests/unittests/test_swap.py
354+++ b/tests/unittests/test_swap.py
355@@ -1,4 +1,4 @@
356-import mock
357+from unittest import mock
358
359 from curtin import swap
360 from curtin import util
361diff --git a/tests/unittests/test_udev.py b/tests/unittests/test_udev.py
362index 39c50e2..fb97c3d 100644
363--- a/tests/unittests/test_udev.py
364+++ b/tests/unittests/test_udev.py
365@@ -1,6 +1,6 @@
366 # This file is part of curtin. See LICENSE file for copyright and license info.
367
368-import mock
369+from unittest import mock
370 import shlex
371
372 from curtin.udev import (
373diff --git a/tests/unittests/test_url_helper.py b/tests/unittests/test_url_helper.py
374index 1b550f6..9ed37ff 100644
375--- a/tests/unittests/test_url_helper.py
376+++ b/tests/unittests/test_url_helper.py
377@@ -2,7 +2,7 @@
378
379 import filecmp
380 import json
381-import mock
382+from unittest import mock
383
384 from curtin import url_helper
385
386diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
387index f259da4..e2c4caf 100644
388--- a/tests/unittests/test_util.py
389+++ b/tests/unittests/test_util.py
390@@ -1,7 +1,6 @@
391 # This file is part of curtin. See LICENSE file for copyright and license info.
392
393-from unittest import skipIf
394-import mock
395+from unittest import mock
396 import os
397 import stat
398 from textwrap import dedent
399@@ -717,7 +716,6 @@ class TestLoadFile(CiTestCase):
400 self.assertEqual(contents, loaded_contents)
401 m_open.assert_called_with(fname, 'rb')
402
403- @skipIf(mock.__version__ < '2.0.0', "mock version < 2.0.0")
404 def test_load_file_handles_utf8(self):
405 fname = 'test.cfg'
406 contents = b'd\xc3\xa9j\xc8\xa7'
407@@ -726,7 +724,6 @@ class TestLoadFile(CiTestCase):
408 self.assertEqual(f.read(), contents)
409 m_open.assert_called_with(fname, 'rb')
410
411- @skipIf(mock.__version__ < '2.0.0', "mock version < 2.0.0")
412 @mock.patch('curtin.util.decode_binary')
413 def test_load_file_respects_decode_false(self, mock_decode):
414 fname = 'test.cfg'
415diff --git a/tests/unittests/test_version.py b/tests/unittests/test_version.py
416index 9a9aec9..8fd2102 100644
417--- a/tests/unittests/test_version.py
418+++ b/tests/unittests/test_version.py
419@@ -1,6 +1,6 @@
420 # This file is part of curtin. See LICENSE file for copyright and license info.
421
422-import mock
423+from unittest import mock
424 import subprocess
425 import os
426
427diff --git a/tox.ini b/tox.ini
428index 32c6602..573c1f7 100644
429--- a/tox.ini
430+++ b/tox.ini
431@@ -66,7 +66,6 @@ commands =
432 # different behavior. Note, we do only run pyflakes3, though.
433 deps = pyflakes==0.8.1
434 pep8==1.4.6
435- mock==1.0.1
436 nose==1.3.1
437 pyyaml==3.10
438 oauthlib==0.6.1
439@@ -85,7 +84,6 @@ commands = {envpython} {toxinidir}/tools/noproxy {envpython} -m nose \
440
441 [testenv:xenial]
442 deps =
443- mock==1.3.0
444 nose==1.3.7
445 pyyaml==3.11
446 oauthlib==1.0.3

Subscribers

People subscribed via source and target branches