summaryrefslogtreecommitdiff
path: root/tests/unittests/test_util.py
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-01-23 16:32:01 -0500
committerChad Smith <chad.smith@canonical.com>2020-01-23 14:32:01 -0700
commit6b157aa60a10fa74374287f0ec0313255e0462b4 (patch)
tree8d2e89cdde2cf3ca1450f7fd14f386639f838dc2 /tests/unittests/test_util.py
parent6603706eec1c39d9d591c8ffa0ef7171b74d84d6 (diff)
downloadvyos-cloud-init-6b157aa60a10fa74374287f0ec0313255e0462b4.tar.gz
vyos-cloud-init-6b157aa60a10fa74374287f0ec0313255e0462b4.zip
cloudinit: remove ImportError handling for mock imports (#182)
We only run on Python 3 now, so we can unambiguously expect unittest.mock to exist.
Diffstat (limited to 'tests/unittests/test_util.py')
-rw-r--r--tests/unittests/test_util.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index 75a3f0b4..9ff17f52 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -12,15 +12,11 @@ import stat
import sys
import tempfile
import yaml
+from unittest import mock
from cloudinit import importer, util
from cloudinit.tests import helpers
-try:
- from unittest import mock
-except ImportError:
- import mock
-
BASH = util.which('bash')
BOGUS_COMMAND = 'this-is-not-expected-to-be-a-program-name'