diff options
| author | toofar <toofar@spalge.com> | 2022-11-20 15:48:00 +1300 |
|---|---|---|
| committer | toofar <toofar@spalge.com> | 2022-11-20 15:48:00 +1300 |
| commit | 2d6646619449d0baa72b35c9e88a3cc8f7c0b790 (patch) | |
| tree | 1501ae07ce9917d257ce900e17a921f369c3ae88 /pytest.ini | |
| parent | d9a46b1a62792b3f74e428bbde852209328f1e8d (diff) | |
| parent | 1417ffa519a7c43197edafde76dd49fc348784f7 (diff) | |
| download | qutebrowser-2d6646619449d0baa72b35c9e88a3cc8f7c0b790.tar.gz qutebrowser-2d6646619449d0baa72b35c9e88a3cc8f7c0b790.zip | |
Merge branch 'master' into qt6-v2
Just a few conflicts around CI and dependencies.
Diffstat (limited to 'pytest.ini')
| -rw-r--r-- | pytest.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pytest.ini b/pytest.ini index 0dcf47429..ab46bd391 100644 --- a/pytest.ini +++ b/pytest.ini @@ -35,6 +35,7 @@ markers = fake_os: Fake utils.is_* to a fake operating system unicode_locale: Tests which need a unicode locale to work qtwebkit_pdf_imageformat_skip: Broken on QtWebKit with PDF image format plugin installed + qtwebkit_openssl3_skip: Broken due to cheroot bug with OpenSSL 3 on QtWebKit windows_skip: Tests which should be skipped on Windows qt5_only: Tests which should only run with Qt 5 qt6_only: Tests which should only run with Qt 6 @@ -62,4 +63,6 @@ filterwarnings = # https://github.com/HypothesisWorks/hypothesis/issues/3309 ignore:module 'sre_constants' is deprecated:DeprecationWarning ignore:module 'sre_parse' is deprecated:DeprecationWarning + # https://github.com/pytest-dev/pytest-instafail/pull/26 + ignore:The hookimpl pytest_.* uses old-style configuration options:pytest.PytestDeprecationWarning:pytest_instafail faulthandler_timeout = 90 |