Fix pytest "Applying marks directly to parameters" deprecation

2018-12-09 15:02:48 +01:00
parent 89a277c354
commit 3443a233f4
5 changed files with 24 additions and 14 deletions
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -20,7 +20,9 @@ def group(pytestconfig):
    return {"id": load_variable("group_id", pytestconfig.cache), "type": ThreadType.GROUP}


-@pytest.fixture(scope="session", params=["user", "group", pytest.mark.xfail("none")])
+@pytest.fixture(scope="session", params=[
+    "user", "group", pytest.param("none", marks=[pytest.mark.xfail()])
+])
 def thread(request, user, group):
    return {
        "user": user,