summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorLembrun <amadeusk7@free.fr>2021-03-10 13:56:37 +0100
committerLembrun <amadeusk7@free.fr>2021-03-10 13:56:37 +0100
commit63dded1bdb1dc9035a19a729b34cd224d4a766b6 (patch)
treeac88a32d645e957f90f77f079805dd1348eee2fc /tests/conftest.py
parent6eb12de2746f99ec4f48f0505b9dda35c7554589 (diff)
parent0a38fff4c675b384289728a4d45f9c1fe1f9d4fc (diff)
downloadqutebrowser-63dded1bdb1dc9035a19a729b34cd224d4a766b6.tar.gz
qutebrowser-63dded1bdb1dc9035a19a729b34cd224d4a766b6.zip
Merge branch 'master' into pathlib-/tests/conftest.py
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index c400a0756..48bef908a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -109,12 +109,6 @@ def _apply_platform_markers(config, item):
pytest.mark.skipif,
sys.getfilesystemencoding() == 'ascii',
"Skipped because of ASCII locale"),
-
- ('qtwebkit6021_xfail',
- pytest.mark.xfail,
- version.qWebKitVersion and # type: ignore[unreachable]
- version.qWebKitVersion() == '602.1',
- "Broken on WebKit 602.1")
]
for searched_marker, new_marker_kind, condition, default_reason in markers: