From b88a22b1397832a3366a425cf155ab5aa4d50965 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 2 Oct 2015 08:51:26 +0200 Subject: [PATCH] tests: Add a not_osx platform marker. --- pytest.ini | 1 + tests/conftest.py | 1 + 2 files changed, 2 insertions(+) diff --git a/pytest.ini b/pytest.ini index 18458fe7a..49c4cfa90 100644 --- a/pytest.ini +++ b/pytest.ini @@ -6,6 +6,7 @@ markers = 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. not_frozen: Tests which can't be run if sys.frozen is True. frozen: Tests which can only be run if sys.frozen is True. integration: Tests which test a bigger portion of code, run without coverage. diff --git a/tests/conftest.py b/tests/conftest.py index 4e09840ac..b2d3851a4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -89,6 +89,7 @@ def pytest_runtest_setup(item): ('windows', os.name != 'nt', "Requires Windows"), ('linux', not sys.platform.startswith('linux'), "Requires Linux"), ('osx', sys.platform != 'darwin', "Requires OS X"), + ('not_osx', sys.platform == 'darwin', "Skipped on OS X"), ('not_frozen', getattr(sys, 'frozen', False), "Can't be run when frozen"), ('frozen', not getattr(sys, 'frozen', False),