Module: check_mk Branch: master Commit: 0518deb75e24845c6362d92835bc668c98a51027 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0518deb75e2484… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 11:48:34 2017 +0100 Added new marker for classifying HTML test generators Change-Id: I38c3167094a19838cb0b9fe97a43c20c3bb7ca44 --- pytest.ini | 1 + tests/conftest.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index 6426817..e1e59d1 100644 --- a/pytest.ini +++ b/pytest.ini @@ -8,3 +8,4 @@ markers = pylint: Mark a test as pylint test. git: Mark a test to be executed in the Git repository context packaging: This is a test to execute to verify the packaging of the testbuilds. + html_gentest: Generate test cases for htmllib refactoring. diff --git a/tests/conftest.py b/tests/conftest.py index fbcd902..ebb7d16 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -57,7 +57,7 @@ def pytest_runtest_setup(item): def pytest_cmdline_main(config): # Some special tests are not executed in a site environment - if config.getoption('markexpr') in [ "packaging", "git" ]: + if config.getoption('markexpr') in [ "packaging", "git", "html_gentest" ]: return setup_site_and_switch_user()