diff options
| author | Ryan Roden-Corrent <ryan@rcorre.net> | 2017-08-06 10:54:19 -0400 |
|---|---|---|
| committer | Ryan Roden-Corrent <ryan@rcorre.net> | 2017-08-06 18:13:49 -0400 |
| commit | 71b71dbc58092b6068a3f5ee4b1c287193ad348d (patch) | |
| tree | 28c7ccffac920c433d92740a0f575f9d8357ef09 /pytest.ini | |
| parent | 0f85898137e6065e8558b3b01b010255f3ca3404 (diff) | |
| parent | 49b858e3599a361cf5c994358c6b189dddfb522c (diff) | |
| download | qutebrowser-71b71dbc58092b6068a3f5ee4b1c287193ad348d.tar.gz qutebrowser-71b71dbc58092b6068a3f5ee4b1c287193ad348d.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pytest.ini')
| -rw-r--r-- | pytest.ini | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pytest.ini b/pytest.ini index e13ab3a3b..0062b26e2 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,12 +1,13 @@ [pytest] -addopts = --strict -rfEw --faulthandler-timeout=70 --instafail --pythonwarnings error +addopts = --strict -rfEw --faulthandler-timeout=70 --instafail --pythonwarnings error --benchmark-columns=Min,Max,Median +testpaths = tests markers = gui: Tests using the GUI (e.g. spawning widgets) posix: Tests which only can run on a POSIX OS. windows: Tests which only can run on Windows. linux: Tests which only can run on Linux. - osx: Tests which only can run on OS X. - not_osx: Tests which can not run on OS X. + mac: Tests which only can run on macOS. + not_mac: Tests which can not run on macOS. not_frozen: Tests which can't be run if sys.frozen is True. no_xvfb: Tests which can't be run with Xvfb. frozen: Tests which can only be run if sys.frozen is True. @@ -21,7 +22,7 @@ markers = qtwebkit_ng_xfail: Tests failing with QtWebKit-NG qtwebkit_ng_skip: Tests skipped with QtWebKit-NG qtwebengine_flaky: Tests which are flaky (and currently skipped) with QtWebEngine - qtwebengine_osx_xfail: Tests which fail on OS X with QtWebEngine + qtwebengine_mac_xfail: Tests which fail on macOS with QtWebEngine js_prompt: Tests needing to display a javascript prompt this: Used to mark tests during development no_invalid_lines: Don't fail on unparseable lines in end2end tests @@ -47,6 +48,7 @@ qt_log_ignore = ^QGeoclueMaster error creating GeoclueMasterClient\. ^Geoclue error: Process org\.freedesktop\.Geoclue\.Master exited with status 127 ^Failed to create Geoclue client interface. Geoclue error: org\.freedesktop\.DBus\.Error\.Disconnected + ^QDBusConnection: name 'org.freedesktop.Geoclue.Master' had owner '' but we thought it was ':1.1' ^QObject::connect: Cannot connect \(null\)::stateChanged\(QNetworkSession::State\) to QNetworkReplyHttpImpl::_q_networkSessionStateChanged\(QNetworkSession::State\) ^QXcbClipboard: Cannot transfer data, no data available ^load glyph failed |