diff options
| author | Simon McVittie <smcv@collabora.com> | 2021-10-28 12:46:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-28 12:46:57 +0100 |
| commit | ff499bba751eadcf9f6abcd5578a7724d426f21b (patch) | |
| tree | 8332d3e686b479c465ae590cde677731b4b1be6c | |
| parent | 049a16f6f9e5046553245ec49dea8f5f078753ef (diff) | |
| parent | 47908b5389d1f3de9306c0030856b3d3180ade86 (diff) | |
Merge pull request #89 from smcv/mock-imports
tests: Fix import pattern for mock objects
| -rw-r--r-- | tests/test_bmap_helpers.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/test_bmap_helpers.py b/tests/test_bmap_helpers.py index 56b079e..36c4557 100644 --- a/tests/test_bmap_helpers.py +++ b/tests/test_bmap_helpers.py @@ -22,9 +22,9 @@ import os import sys import tempfile try: - from unittest.mock import patch, mock + from unittest.mock import patch except ImportError: # for Python < 3.3 - from mock import patch, mock + from mock import patch try: from tempfile import TemporaryDirectory except ImportError: # for Python < 3.2 @@ -76,7 +76,7 @@ class TestBmapHelpers(unittest.TestCase): delete=True, dir=".", suffix=".txt") as fobj: fobj.write("1") fobj.flush() - mockobj = mock.patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) + mockobj = patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) with mockobj: self.assertTrue(BmapHelpers.is_zfs_configuration_compatible()) @@ -88,7 +88,7 @@ class TestBmapHelpers(unittest.TestCase): delete=True, dir=".", suffix=".txt") as fobj: fobj.write("0") fobj.flush() - mockobj = mock.patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) + mockobj = patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) with mockobj: self.assertFalse(BmapHelpers.is_zfs_configuration_compatible()) @@ -97,7 +97,7 @@ class TestBmapHelpers(unittest.TestCase): with tempfile.NamedTemporaryFile("a", prefix="testfile_", delete=True, dir=".", suffix=".txt") as fobj: - mockobj = mock.patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) + mockobj = patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) with self.assertRaises(BmapHelpers.Error): with mockobj: BmapHelpers.is_zfs_configuration_compatible() @@ -116,7 +116,7 @@ class TestBmapHelpers(unittest.TestCase): directory = os.path.dirname(__file__) filepath = os.path.join(directory, "BmapHelpers/file/does/not/exist") - mockobj = mock.patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", filepath) + mockobj = patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", filepath) with mockobj: self.assertFalse(BmapHelpers.is_zfs_configuration_compatible()) @@ -128,7 +128,7 @@ class TestBmapHelpers(unittest.TestCase): delete=True, dir=".", suffix=".img") as fobj: fobj.write("1") fobj.flush() - mockobj = mock.patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) + mockobj = patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) with mockobj: self.assertTrue(BmapHelpers.is_compatible_file_system(fobj.name)) @@ -140,7 +140,7 @@ class TestBmapHelpers(unittest.TestCase): delete=True, dir=".", suffix=".img") as fobj: fobj.write("0") fobj.flush() - mockobj = mock.patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) + mockobj = patch.object(BmapHelpers, "ZFS_COMPAT_PARAM_PATH", fobj.name) with mockobj: self.assertFalse(BmapHelpers.is_compatible_file_system(fobj.name)) |