curtin-dev team mailing list archive

[Dan Bungert <mp+448305@xxxxxxxxxxxxxxxxxx>]

Dan Bungert has proposed merging ~dbungert/curtin:mock-from-unittests into curtin:master.

Commit message:
unittest: use unittest.mock instead of mock



Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/448305
-- 
Your team curtin developers is requested to review the proposed merge of ~dbungert/curtin:mock-from-unittests into curtin:master.

diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index ffb2775..3e01b3a 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -3,7 +3,7 @@
 import imp
 import importlib
 import logging
-import mock
+from unittest import mock
 import os
 import random
 import shutil
diff --git a/tests/unittests/test_apt_custom_sources_list.py b/tests/unittests/test_apt_custom_sources_list.py
index dafc478..e0d0c08 100644
--- a/tests/unittests/test_apt_custom_sources_list.py
+++ b/tests/unittests/test_apt_custom_sources_list.py
@@ -7,8 +7,8 @@ import logging
 import os
 import yaml
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 import textwrap
 
 from curtin import distro
diff --git a/tests/unittests/test_apt_source.py b/tests/unittests/test_apt_source.py
index 9a840c2..687e8a1 100644
--- a/tests/unittests/test_apt_source.py
+++ b/tests/unittests/test_apt_source.py
@@ -9,8 +9,8 @@ import re
 import socket
 
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from aptsources.sourceslist import SourceEntry
 
diff --git a/tests/unittests/test_block.py b/tests/unittests/test_block.py
index bb7205e..1ef8f80 100644
--- a/tests/unittests/test_block.py
+++ b/tests/unittests/test_block.py
@@ -3,7 +3,7 @@
 import functools
 import json
 import os
-import mock
+from unittest import mock
 import sys
 import textwrap
 
diff --git a/tests/unittests/test_block_bcache.py b/tests/unittests/test_block_bcache.py
index 7936522..052466f 100644
--- a/tests/unittests/test_block_bcache.py
+++ b/tests/unittests/test_block_bcache.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import os
 
 from curtin.block import bcache
diff --git a/tests/unittests/test_block_iscsi.py b/tests/unittests/test_block_iscsi.py
index f8ef5d8..2a55f81 100644
--- a/tests/unittests/test_block_iscsi.py
+++ b/tests/unittests/test_block_iscsi.py
@@ -1,6 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-import mock
+from unittest import mock
 import os
 
 from curtin.block import iscsi
diff --git a/tests/unittests/test_block_lvm.py b/tests/unittests/test_block_lvm.py
index 315281d..d096799 100644
--- a/tests/unittests/test_block_lvm.py
+++ b/tests/unittests/test_block_lvm.py
@@ -3,7 +3,7 @@
 from curtin.block import lvm
 
 from .helpers import CiTestCase
-import mock
+from unittest import mock
 
 
 class TestBlockLvm(CiTestCase):
diff --git a/tests/unittests/test_block_mdadm.py b/tests/unittests/test_block_mdadm.py
index 74396d8..9493102 100644
--- a/tests/unittests/test_block_mdadm.py
+++ b/tests/unittests/test_block_mdadm.py
@@ -1,6 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-from mock import call, patch
+from unittest.mock import call, patch
 from curtin.block import dev_short
 from curtin.block import mdadm
 from curtin import util
diff --git a/tests/unittests/test_block_mkfs.py b/tests/unittests/test_block_mkfs.py
index 63c0acf..163cee6 100644
--- a/tests/unittests/test_block_mkfs.py
+++ b/tests/unittests/test_block_mkfs.py
@@ -3,7 +3,7 @@
 from curtin.block import mkfs
 
 from .helpers import CiTestCase
-import mock
+from unittest import mock
 
 
 class TestBlockMkfs(CiTestCase):
diff --git a/tests/unittests/test_block_multipath.py b/tests/unittests/test_block_multipath.py
index db767ab..7c938a0 100644
--- a/tests/unittests/test_block_multipath.py
+++ b/tests/unittests/test_block_multipath.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from curtin.block import multipath
 from .helpers import CiTestCase
diff --git a/tests/unittests/test_block_zfs.py b/tests/unittests/test_block_zfs.py
index e392000..72cfd3f 100644
--- a/tests/unittests/test_block_zfs.py
+++ b/tests/unittests/test_block_zfs.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from curtin.config import merge_config
 from curtin.block import zfs
diff --git a/tests/unittests/test_clear_holders.py b/tests/unittests/test_clear_holders.py
index 0cdd979..48715e0 100644
--- a/tests/unittests/test_clear_holders.py
+++ b/tests/unittests/test_clear_holders.py
@@ -1,6 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-import mock
+from unittest import mock
 import os
 import textwrap
 import uuid
diff --git a/tests/unittests/test_commands_apply_net.py b/tests/unittests/test_commands_apply_net.py
index 04b7f2e..e9cd385 100644
--- a/tests/unittests/test_commands_apply_net.py
+++ b/tests/unittests/test_commands_apply_net.py
@@ -1,6 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-from mock import patch, call
+from unittest.mock import patch, call
 import copy
 import os
 
diff --git a/tests/unittests/test_commands_block_meta.py b/tests/unittests/test_commands_block_meta.py
index 028d04e..6388e0b 100644
--- a/tests/unittests/test_commands_block_meta.py
+++ b/tests/unittests/test_commands_block_meta.py
@@ -3,7 +3,7 @@
 from argparse import Namespace
 from collections import OrderedDict
 import copy
-from mock import (
+from unittest.mock import (
     call,
     Mock,
     patch,
diff --git a/tests/unittests/test_commands_collect_logs.py b/tests/unittests/test_commands_collect_logs.py
index 2077719..3a56a59 100644
--- a/tests/unittests/test_commands_collect_logs.py
+++ b/tests/unittests/test_commands_collect_logs.py
@@ -2,7 +2,7 @@ from collections import namedtuple
 import copy
 from datetime import datetime
 import json
-import mock
+from unittest import mock
 import os
 from textwrap import dedent
 
diff --git a/tests/unittests/test_commands_install.py b/tests/unittests/test_commands_install.py
index 125e3d9..3c62c9c 100644
--- a/tests/unittests/test_commands_install.py
+++ b/tests/unittests/test_commands_install.py
@@ -2,7 +2,7 @@
 
 import copy
 import json
-import mock
+from unittest import mock
 import os
 
 from curtin import config
diff --git a/tests/unittests/test_commands_install_grub.py b/tests/unittests/test_commands_install_grub.py
index fc19da3..8fbf12e 100644
--- a/tests/unittests/test_commands_install_grub.py
+++ b/tests/unittests/test_commands_install_grub.py
@@ -7,7 +7,7 @@ from curtin import paths
 from curtin.commands import install_grub
 from .helpers import CiTestCase
 
-import mock
+from unittest import mock
 import os
 
 
diff --git a/tests/unittests/test_commands_net_meta.py b/tests/unittests/test_commands_net_meta.py
index 76da74b..86dc036 100644
--- a/tests/unittests/test_commands_net_meta.py
+++ b/tests/unittests/test_commands_net_meta.py
@@ -2,7 +2,7 @@
 
 import os
 
-from mock import MagicMock, call
+from unittest.mock import MagicMock, call
 
 from .helpers import CiTestCase, simple_mocked_open
 
diff --git a/tests/unittests/test_commands_unmount.py b/tests/unittests/test_commands_unmount.py
index 2ef6589..95d4dd3 100644
--- a/tests/unittests/test_commands_unmount.py
+++ b/tests/unittests/test_commands_unmount.py
@@ -5,7 +5,7 @@ from curtin.util import FileMissingError
 from .helpers import CiTestCase
 
 import argparse
-import mock
+from unittest import mock
 import os
 
 
diff --git a/tests/unittests/test_curthooks.py b/tests/unittests/test_curthooks.py
index a67bc81..0728260 100644
--- a/tests/unittests/test_curthooks.py
+++ b/tests/unittests/test_curthooks.py
@@ -1,7 +1,7 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
 import os
-from mock import call, patch
+from unittest.mock import call, patch
 import textwrap
 from typing import Optional
 
diff --git a/tests/unittests/test_distro.py b/tests/unittests/test_distro.py
index 5743475..400b4ae 100644
--- a/tests/unittests/test_distro.py
+++ b/tests/unittests/test_distro.py
@@ -1,7 +1,7 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
 from unittest import skipIf
-import mock
+from unittest import mock
 import os
 import sys
 
diff --git a/tests/unittests/test_gpg.py b/tests/unittests/test_gpg.py
index 42ff8c4..0d6c7eb 100644
--- a/tests/unittests/test_gpg.py
+++ b/tests/unittests/test_gpg.py
@@ -1,6 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-from mock import call, patch
+from unittest.mock import call, patch
 import textwrap
 
 from curtin import gpg
diff --git a/tests/unittests/test_make_dname.py b/tests/unittests/test_make_dname.py
index ec48339..1dc7da0 100644
--- a/tests/unittests/test_make_dname.py
+++ b/tests/unittests/test_make_dname.py
@@ -1,6 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-import mock
+from unittest import mock
 
 import textwrap
 import uuid
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index 449b3b6..157029c 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -1,6 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-import mock
+from unittest import mock
 import os
 import yaml
 
diff --git a/tests/unittests/test_partitioning.py b/tests/unittests/test_partitioning.py
index ac1ad79..50ff07c 100644
--- a/tests/unittests/test_partitioning.py
+++ b/tests/unittests/test_partitioning.py
@@ -1,7 +1,7 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
 from unittest import skip
-import mock
+from unittest import mock
 import curtin.commands.block_meta
 from .helpers import CiTestCase
 
diff --git a/tests/unittests/test_reporter.py b/tests/unittests/test_reporter.py
index 09b8bcf..bce3e13 100644
--- a/tests/unittests/test_reporter.py
+++ b/tests/unittests/test_reporter.py
@@ -6,7 +6,7 @@ from __future__ import (
     unicode_literals,
     )
 
-from mock import patch
+from unittest.mock import patch
 
 from curtin.reporter.legacy import (
     EmptyReporter,
diff --git a/tests/unittests/test_swap.py b/tests/unittests/test_swap.py
index d37d519..ffdc883 100644
--- a/tests/unittests/test_swap.py
+++ b/tests/unittests/test_swap.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from curtin import swap
 from curtin import util
diff --git a/tests/unittests/test_udev.py b/tests/unittests/test_udev.py
index 39c50e2..fb97c3d 100644
--- a/tests/unittests/test_udev.py
+++ b/tests/unittests/test_udev.py
@@ -1,6 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-import mock
+from unittest import mock
 import shlex
 
 from curtin.udev import (
diff --git a/tests/unittests/test_url_helper.py b/tests/unittests/test_url_helper.py
index 1b550f6..9ed37ff 100644
--- a/tests/unittests/test_url_helper.py
+++ b/tests/unittests/test_url_helper.py
@@ -2,7 +2,7 @@
 
 import filecmp
 import json
-import mock
+from unittest import mock
 
 from curtin import url_helper
 
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index f259da4..92d382e 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -1,7 +1,7 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
 from unittest import skipIf
-import mock
+from unittest import mock
 import os
 import stat
 from textwrap import dedent
@@ -717,7 +717,6 @@ class TestLoadFile(CiTestCase):
             self.assertEqual(contents, loaded_contents)
             m_open.assert_called_with(fname, 'rb')
 
-    @skipIf(mock.__version__ < '2.0.0', "mock version < 2.0.0")
     def test_load_file_handles_utf8(self):
         fname = 'test.cfg'
         contents = b'd\xc3\xa9j\xc8\xa7'
@@ -726,7 +725,6 @@ class TestLoadFile(CiTestCase):
                 self.assertEqual(f.read(), contents)
             m_open.assert_called_with(fname, 'rb')
 
-    @skipIf(mock.__version__ < '2.0.0', "mock version < 2.0.0")
     @mock.patch('curtin.util.decode_binary')
     def test_load_file_respects_decode_false(self, mock_decode):
         fname = 'test.cfg'
diff --git a/tests/unittests/test_version.py b/tests/unittests/test_version.py
index 9a9aec9..8fd2102 100644
--- a/tests/unittests/test_version.py
+++ b/tests/unittests/test_version.py
@@ -1,6 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-import mock
+from unittest import mock
 import subprocess
 import os