diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-07-08 11:12:43 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2017-07-08 11:12:43 +0200 |
| commit | ad615941a28e0a382c93bebc2852c1812ce12c07 (patch) | |
| tree | c90a4c026abc0cc39a6660f20e285da747226597 /pytest.ini | |
| parent | 0de0bbfa712d7b537b8be030b051f9d2b6b57c6c (diff) | |
| download | qutebrowser-ad615941a28e0a382c93bebc2852c1812ce12c07.tar.gz qutebrowser-ad615941a28e0a382c93bebc2852c1812ce12c07.zip | |
Replace OS X with macOS
Diffstat (limited to 'pytest.ini')
| -rw-r--r-- | pytest.ini | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pytest.ini b/pytest.ini index ab437801b..ad1a56086 100644 --- a/pytest.ini +++ b/pytest.ini @@ -5,8 +5,8 @@ markers = 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. @@ -20,7 +20,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 |