diff options
author | Simon McVittie <smcv@debian.org> | 2021-10-28 11:05:52 +0100 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2021-10-28 11:35:54 +0100 |
commit | dfba9f9c664c240bbf339189bf7abd7314bcafbc (patch) | |
tree | 25637027a24ccbb300fdd20c79189f2c226e11b7 | |
parent | a1ca1172f259f32ff9eb0469567be1a9085cca88 (diff) |
tests: Try to use TemporaryDirectory from Python standard library
This avoids an unnecessary external dependency with Python >= 3.2.
Signed-off-by: Simon McVittie <smcv@debian.org>
-rw-r--r-- | requirements-test.txt | 2 | ||||
-rw-r--r-- | tests/test_bmap_helpers.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/requirements-test.txt b/requirements-test.txt index cea340a..f83802d 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,4 +1,4 @@ six nose -backports.tempfile +backports.tempfile ; python_version < '3.2' mock ; python_version < '3.3' diff --git a/tests/test_bmap_helpers.py b/tests/test_bmap_helpers.py index 47b3862..56b079e 100644 --- a/tests/test_bmap_helpers.py +++ b/tests/test_bmap_helpers.py @@ -25,7 +25,10 @@ try: from unittest.mock import patch, mock except ImportError: # for Python < 3.3 from mock import patch, mock -from backports import tempfile as btempfile +try: + from tempfile import TemporaryDirectory +except ImportError: # for Python < 3.2 + from backports.tempfile import TemporaryDirectory from bmaptools import BmapHelpers @@ -58,7 +61,7 @@ class TestBmapHelpers(unittest.TestCase): def test_get_file_system_type_symlink(self): """Check a file system type is returned when used with a symlink""" - with btempfile.TemporaryDirectory(prefix="testdir_", dir=".") as directory: + with TemporaryDirectory(prefix="testdir_", dir=".") as directory: fobj = tempfile.NamedTemporaryFile("r", prefix="testfile_", delete=False, dir=directory, suffix=".img") lnk = os.path.join(directory, "test_symlink") |