summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2021-10-28 11:03:09 +0100
committerSimon McVittie <smcv@debian.org>2021-10-28 12:49:16 +0100
commitd98071162295759ace2c7e28c6bd0a1c94afba77 (patch)
tree81736e9dc10648e3ce8bcd7fd7bea3ede059348a
parentc9598ee6bd8299adf92fc75101c66127e3160fca (diff)
tests: Use unittest.mock from Python standard library if possible
This avoids an unnecessary external dependency when using Python >= 3.3. Signed-off-by: Simon McVittie <smcv@debian.org> Forwarded: https://github.com/intel/bmap-tools/pull/87 Applied-upstream: 3.7, commit:a1ca1172f259f32ff9eb0469567be1a9085cca88 Gbp-Pq: Name tests-Use-unittest.mock-from-Python-standard-library-if-p.patch
-rw-r--r--requirements-test.txt2
-rw-r--r--tests/test_bmap_helpers.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/requirements-test.txt b/requirements-test.txt
index 1cc6bbb..cea340a 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,4 +1,4 @@
six
nose
backports.tempfile
-mock \ No newline at end of file
+mock ; python_version < '3.3'
diff --git a/tests/test_bmap_helpers.py b/tests/test_bmap_helpers.py
index 1617957..47b3862 100644
--- a/tests/test_bmap_helpers.py
+++ b/tests/test_bmap_helpers.py
@@ -21,7 +21,10 @@ This test verifies 'BmapHelpers' module functionality.
import os
import sys
import tempfile
-from mock import patch, mock
+try:
+ from unittest.mock import patch, mock
+except ImportError: # for Python < 3.3
+ from mock import patch, mock
from backports import tempfile as btempfile
from bmaptools import BmapHelpers