summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2016-11-20 15:20:17 -0500
committerNed Batchelder <ned@nedbatchelder.com>2016-11-20 15:20:17 -0500
commit4d3462f262bf987873cebb2d527963fb1eb8a53a (patch)
treea0c34bb483a2ba5ca2ad4d104665caea2409ce70
parent28f407337314d00222110577621b082210825414 (diff)
downloadpython-coveragepy-git-4d3462f262bf987873cebb2d527963fb1eb8a53a.tar.gz
Use my fix for pytest
-rw-r--r--igor.py4
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 3 deletions
diff --git a/igor.py b/igor.py
index 77c97d3c..07a22311 100644
--- a/igor.py
+++ b/igor.py
@@ -105,10 +105,10 @@ def run_tests(tracer, *nose_args):
if 'COVERAGE_PYTEST' in os.environ:
import pytest
runner_args = list(nose_args)
- pytest.main(runner_args)
+ return pytest.main(runner_args)
else:
nose_args = ["nosetests"] + list(nose_args)
- nose.core.main(argv=nose_args)
+ return nose.core.main(argv=nose_args)
def run_tests_with_coverage(tracer, *nose_args):
diff --git a/tox.ini b/tox.ini
index a55f8458..900bdcd5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ usedevelop = True
deps =
# https://requires.io/github/nedbat/coveragepy/requirements/
- pytest
+ git+https://github.com/nedbat/pytest.git@bug2038#egg=pytest==0.0
pip==8.1.2
nose==1.3.7
mock==2.0.0