Replace mock library with unittest.mock (#186)

* cloudinit: replace "import mock" with "from unittest import mock"

* test-requirements.txt: drop mock

Co-authored-by: Chad Smith <chad.smith@canonical.com>

8 files changed, 11 insertions, 10 deletions

diff --git a/cloudinit/config/tests/test_set_passwords.py b/cloudinit/config/tests/test_set_passwords.py
index 85e2f1fe..3b5cdd06 100644
--- a/cloudinit/config/tests/test_set_passwords.py
+++ b/cloudinit/config/tests/test_set_passwords.py
@@ -1,6 +1,6 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
-import mock
+from unittest import mock
 
 from cloudinit.config import cc_set_passwords as setpass
 from cloudinit.tests.helpers import CiTestCase
diff --git a/cloudinit/net/tests/test_init.py b/cloudinit/net/tests/test_init.py
index 6db93e26..5081a337 100644
--- a/cloudinit/net/tests/test_init.py
+++ b/cloudinit/net/tests/test_init.py
@@ -3,10 +3,10 @@
 import copy
 import errno
 import httpretty
-import mock
 import os
 import requests
 import textwrap
+from unittest import mock
 
 import cloudinit.net as net
 from cloudinit.util import ensure_file, write_file, ProcessExecutionError
diff --git a/cloudinit/net/tests/test_network_state.py b/cloudinit/net/tests/test_network_state.py
index fcb4a995..55880852 100644
--- a/cloudinit/net/tests/test_network_state.py
+++ b/cloudinit/net/tests/test_network_state.py
@@ -1,6 +1,7 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
-import mock
+from unittest import mock
+
 from cloudinit.net import network_state
 from cloudinit.tests.helpers import CiTestCase
 
diff --git a/cloudinit/sources/tests/test_oracle.py b/cloudinit/sources/tests/test_oracle.py
index 6c551fcb..abf3d359 100644
--- a/cloudinit/sources/tests/test_oracle.py
+++ b/cloudinit/sources/tests/test_oracle.py
@@ -11,9 +11,9 @@ import argparse
 import copy
 import httpretty
 import json
-import mock
 import os
 import uuid
+from unittest import mock
 
 DS_PATH = "cloudinit.sources.DataSourceOracle"
 MD_VER = "2013-10-17"
diff --git a/cloudinit/tests/helpers.py b/cloudinit/tests/helpers.py
index 0220648d..70f6bad7 100644
--- a/cloudinit/tests/helpers.py
+++ b/cloudinit/tests/helpers.py
@@ -13,8 +13,8 @@ import string
 import sys
 import tempfile
 import time
+from unittest import mock
 
-import mock
 import unittest2
 from unittest2.util import strclass
 
diff --git a/cloudinit/tests/test_dhclient_hook.py b/cloudinit/tests/test_dhclient_hook.py
index 7aab8dd5..eadae81c 100644
--- a/cloudinit/tests/test_dhclient_hook.py
+++ b/cloudinit/tests/test_dhclient_hook.py
@@ -7,8 +7,8 @@ from cloudinit.tests.helpers import CiTestCase, dir2dict, populate_dir
 
 import argparse
 import json
-import mock
 import os
+from unittest import mock
 
 
 class TestDhclientHook(CiTestCase):
diff --git a/cloudinit/tests/test_gpg.py b/cloudinit/tests/test_gpg.py
index 0562b966..8dd57137 100644
--- a/cloudinit/tests/test_gpg.py
+++ b/cloudinit/tests/test_gpg.py
@@ -1,12 +1,12 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 """Test gpg module."""
 
+from unittest import mock
+
 from cloudinit import gpg
 from cloudinit import util
 from cloudinit.tests.helpers import CiTestCase
 
-import mock
-
 
 @mock.patch("cloudinit.gpg.time.sleep")
 @mock.patch("cloudinit.gpg.util.subp")
diff --git a/cloudinit/tests/test_version.py b/cloudinit/tests/test_version.py
index a96c2a47..778a762c 100644
--- a/cloudinit/tests/test_version.py
+++ b/cloudinit/tests/test_version.py
@@ -1,10 +1,10 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
+from unittest import mock
+
 from cloudinit.tests.helpers import CiTestCase
 from cloudinit import version
 
-import mock
-
 
 class TestExportsFeatures(CiTestCase):
     def test_has_network_config_v1(self):