Revert 8a161e8 and fix #71 with a workaround

pytest-testmon is incompatible with pytest-cov now, because they compete on using sys.settrace hook Refs: * tarpas/pytest-testmon#86 * tarpas/pytest-testmon#97 * https://coverage.readthedocs.io/en/coverage-4.5.1/trouble.html#things-that-don-t-work
cherrypy · Apr 21, 2018 · 26eea5c · 26eea5c
1 parent 2561c7e
commit 26eea5c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
 norecursedirs=dist docs build .tox
-addopts=-v -rxs --doctest-modules --ignore cheroot/ssl/pyopenssl.py --junitxml=junit-test-results.xml --cov=cheroot --cov-report term-missing:skip-covered --cov-report xml
+addopts=-v -rxs --testmon --doctest-modules --ignore cheroot/ssl/pyopenssl.py --junitxml=junit-test-results.xml --cov=cheroot --cov-report term-missing:skip-covered --cov-report xml
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@ envlist = python
 [testenv]
 commands =
     rm -rf .eggs/
-    pytest {posargs}
+    pytest -p no:testmon {posargs}
     codecov -f coverage.xml -X gcov
 usedevelop = True
 extras = testing
@@ -25,7 +25,7 @@ setenv =
   WEBTEST_INTERACTIVE=false
 
 [testenv:watch]
-commands = ptw --runner=pytest -- --testmon
+commands = ptw --runner=pytest
 
 [testenv:pre-commit]
 deps = pre-commit