diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-01-29 16:55:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 14:55:39 -0700 |
| commit | 5f8f85bb38cc972d3d2c705a1ec73db3f690f323 (patch) | |
| tree | 6f024357106ab9cd33334096dadd9978b3561849 /cloudinit/tests | |
| parent | 8409dd7da21b064214091edd8f1469267be1e738 (diff) | |
| download | vyos-cloud-init-5f8f85bb38cc972d3d2c705a1ec73db3f690f323.tar.gz vyos-cloud-init-5f8f85bb38cc972d3d2c705a1ec73db3f690f323.zip | |
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>
Diffstat (limited to 'cloudinit/tests')
| -rw-r--r-- | cloudinit/tests/helpers.py | 2 | ||||
| -rw-r--r-- | cloudinit/tests/test_dhclient_hook.py | 2 | ||||
| -rw-r--r-- | cloudinit/tests/test_gpg.py | 4 | ||||
| -rw-r--r-- | cloudinit/tests/test_version.py | 4 |
4 files changed, 6 insertions, 6 deletions
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): |