Commit 41294d5
committed
Use the mock backport on Python 3.7
Because mock.call.kwargs, i.e. the ability to examine
m.call_args.kwargs where m is a Mock or MagicMock, was introduced
in Python 3.8.
Currently it is only in test/test_git.py that any use of mocks
requires this, so I've put the conditional import logic to import
mock (the top-level package) rather than unittest.mock only there.
The mock library is added as a development (testing) dependency
only when the Python version is lower than 3.8, so it is not
installed when not needed.
This fixes a problem in the new tests of whether a shell is used,
and reported as used, in the Popen call in Git.execute. Those
just-introduced tests need this, to be able to use
mock_popen.call_args.kwargs on Python 3.7.1 parent da3460c commit 41294d5
2 files changed
Lines changed: 8 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,7 @@ | |||
| 1 | 1 | black | |
| 2 | 2 | coverage[toml] | |
| 3 | - ddt>=1.1.1, !=1.4.3 | ||
| 3 | + ddt >= 1.1.1, != 1.4.3 | ||
| 4 | + mock ; python_version < "3.8" | ||
| 4 | 5 | mypy | |
| 5 | 6 | pre-commit | |
| 6 | 7 | pytest | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,7 +13,12 @@ | |||
| 13 | 13 | import subprocess | |
| 14 | 14 | import sys | |
| 15 | 15 | from tempfile import TemporaryDirectory, TemporaryFile | |
| 16 | - from unittest import mock, skipUnless | ||
| 16 | + from unittest import skipUnless | ||
| 17 | + | ||
| 18 | + if sys.version_info >= (3, 8): | ||
| 19 | + from unittest import mock | ||
| 20 | + else: | ||
| 21 | + import mock # To be able to examine call_args.kwargs on a mock. | ||
| 17 | 22 | ||
| 18 | 23 | import ddt | |
| 19 | 24 | ||
0 commit comments