diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | igor.py | 9 | ||||
| -rw-r--r-- | tests/test_oddball.py | 3 | ||||
| -rw-r--r-- | tox.ini | 1 |
4 files changed, 11 insertions, 3 deletions
@@ -27,6 +27,7 @@ MANIFEST setuptools-*.egg .tox* .noseids +.cache # Stuff in the test directory. zipmods.zip @@ -102,8 +102,13 @@ def run_tests(tracer, *nose_args): if 'COVERAGE_TESTING' not in os.environ: os.environ['COVERAGE_TESTING'] = "True" print_banner(label_for_tracer(tracer)) - nose_args = ["nosetests"] + list(nose_args) - nose.core.main(argv=nose_args) + if 'COVERAGE_PYTEST' in os.environ: + import pytest + runner_args = list(nose_args) + pytest.main(runner_args) + else: + nose_args = ["nosetests"] + list(nose_args) + nose.core.main(argv=nose_args) def run_tests_with_coverage(tracer, *nose_args): diff --git a/tests/test_oddball.py b/tests/test_oddball.py index 87c65b0e..7fc122af 100644 --- a/tests/test_oddball.py +++ b/tests/test_oddball.py @@ -353,7 +353,8 @@ class DoctestTest(CoverageTest): # of coverage will get. Deleting the imported module here is # enough: when the test imports doctest again, it will get a fresh # copy without the monkeypatch. - del sys.modules['doctest'] + if 'doctest' in sys.modules: + del sys.modules['doctest'] def test_doctest(self): self.check_coverage('''\ @@ -10,6 +10,7 @@ usedevelop = True deps = # https://requires.io/github/nedbat/coveragepy/requirements/ + pytest pip==8.1.2 nose==1.3.7 mock==2.0.0 |