summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-03-12 22:42:18 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-03-12 22:42:18 +0100
commitc7b0023dcd576f7e7d6223f94a4ced5f2932afc5 (patch)
treeeebf29b8a577af9da30b24f4570ab2ed1f9d8bed
parent31dacdd58734e42bbb446e318a55c0e59a6398d3 (diff)
downloadqutebrowser-c7b0023dcd576f7e7d6223f94a4ced5f2932afc5.tar.gz
qutebrowser-c7b0023dcd576f7e7d6223f94a4ced5f2932afc5.zip
Revert "Upgrade to pytest 5.4"
This reverts commit 738d0ab87590a3bbb500726806c1bae5f0fcf1f6. Probably a bad idea before this is fixed: https://github.com/pytest-dev/pytest-rerunfailures/issues/103
-rw-r--r--misc/requirements/requirements-tests.txt3
-rw-r--r--misc/requirements/requirements-tests.txt-raw1
-rw-r--r--pytest.ini2
3 files changed, 2 insertions, 4 deletions
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 2a35d1c8f..870ea94f5 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -24,9 +24,8 @@ parse-type==0.5.2
pluggy==0.13.1
py==1.8.1
py-cpuinfo==5.0.0
-Pygments==2.6.1
pyparsing==2.4.6
-pytest==5.4.0
+pytest==5.3.5
pytest-bdd==3.2.1
pytest-benchmark==3.2.3
pytest-cov==2.8.1
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index 1b972ba18..33880416c 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -16,7 +16,6 @@ pytest-rerunfailures
pytest-travis-fold
pytest-xvfb
vulture
-pygments
#@ markers: jaraco.functools python_version>="3.6"
#@ add: jaraco.functools==2.0; python_version<"3.6" # rq.filter: <= 2.0
diff --git a/pytest.ini b/pytest.ini
index be751d793..1b53cb559 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
[pytest]
log_level = NOTSET
-addopts = --strict --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)