Merge with b3a6ab49a2db9929f2b40025dc68cd15e4030b70
# content of conftest.pyimportpytestdefpytest_addoption(parser):parser.addoption("--runslow",action="store_true",help="run slow tests")defpytest_runtest_setup(item):if'slow'initem.keywordsandnotitem.config.getvalue("runslow"):pytest.skip("need --runslow option to run")