summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy <jimmy@spalge.com>2019-07-02 19:04:40 +1200
committerJimmy <jimmy@spalge.com>2019-07-02 19:07:14 +1200
commitb58cb949e42ebf779cfdb64c9bab762ab0bf0d65 (patch)
treefa855962fff39440a3d8c1776296b0a3f670a5a9
parent3b704238837070dfc8330ac782cde874b5f3fff0 (diff)
downloadqutebrowser-b58cb949e42ebf779cfdb64c9bab762ab0bf0d65.tar.gz
qutebrowser-b58cb949e42ebf779cfdb64c9bab762ab0bf0d65.zip
Remove pytest-faulthandler external plugin.
It is in the core as of pytest 5.0.0.
-rw-r--r--misc/requirements/requirements-tests.txt1
-rw-r--r--pytest.ini3
2 files changed, 2 insertions, 2 deletions
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 9fc662abf..a6c45a6ca 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -27,7 +27,6 @@ pytest==5.0.0
pytest-bdd==3.1.0
pytest-benchmark==3.2.2
pytest-cov==2.7.1
-pytest-faulthandler==1.6.0
pytest-instafail==0.4.1
pytest-mock==1.10.4
pytest-qt==3.2.2
diff --git a/pytest.ini b/pytest.ini
index 89562bb1f..5f4211ab0 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
[pytest]
log_level = NOTSET
-addopts = --strict -rfEw --faulthandler-timeout=90 --instafail --benchmark-columns=Min,Max,Median
+addopts = --strict -rfEw --instafail --benchmark-columns=Min,Max,Median
testpaths = tests
markers =
gui: Tests using the GUI (e.g. spawning widgets)
@@ -70,3 +70,4 @@ qt_log_ignore =
^Attribute Qt::AA_ShareOpenGLContexts must be set before QCoreApplication is created\.
xfail_strict = true
filterwarnings = error
+faulthandler_timeout = 90