Merge pull request #384 from njsmith/enable-faulthandler

Enable pytest-faulthandler
python-trio · Dec 21, 2017 · d9e0f36 · d9e0f36
2 parents bb08242 + 2fa6f0c
commit d9e0f36
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -24,6 +24,6 @@ test_script:
   - "cd empty"
   - "python -c \"import os, trio; print(os.path.dirname(trio.__file__))\""
   # -u makes sure we get prompt output
-  - "python -u -m pytest -W error -ra --run-slow ../trio -v -s --cov=trio --cov-config=../.coveragerc"
+  - "python -u -m pytest -W error -ra --run-slow --faulthandler-timeout=60 ../trio -v -s --cov=trio --cov-config=../.coveragerc"
   - "coverage combine"
   - "codecov"
diff --git a/ci/travis.sh b/ci/travis.sh
@@ -85,7 +85,7 @@ else
     cd empty
 
     INSTALLDIR=$(python -c "import os, trio; print(os.path.dirname(trio.__file__))")
-    pytest -W error -ra --run-slow ${INSTALLDIR} --cov="$INSTALLDIR" --cov-config=../.coveragerc --verbose
+    pytest -W error -ra --run-slow --faulthandler-timeout=60 ${INSTALLDIR} --cov="$INSTALLDIR" --cov-config=../.coveragerc --verbose
 
     coverage combine
     bash <(curl -s https://codecov.io/bash)

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -3,3 +3,4 @@ pytest-cov
 ipython        # for the IPython traceback integration tests
 pyOpenSSL      # for the ssl tests
 trustme        # for the ssl tests
+pytest-faulthandler