summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorivan <ivan@grnet.gr>2017-07-12 16:51:24 +0300
committerivan <ivan@grnet.gr>2017-07-12 16:51:24 +0300
commitfe8f11913ff08341b2f924b79bd7266cc8449ea1 (patch)
treedf8e3f13683210aa201284f78aae4e613df45ce3 /tests/conftest.py
parenta490e4759d5ea5f6e0cdf8da3e853937fe0d9371 (diff)
downloadpysaml2-fe8f11913ff08341b2f924b79bd7266cc8449ea1.tar.gz
Fix pytest warnings about deprecated pytest_funcarg__ prefix
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 3a895627..5048394c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,15 +1,18 @@
import os
+import pytest
#TODO: On my system this function seems to be returning an incorrect location
-def pytest_funcarg__xmlsec(request):
+@pytest.fixture
+def xmlsec(request):
for path in os.environ["PATH"].split(":"):
fil = os.path.join(path, "xmlsec1")
if os.access(fil,os.X_OK):
return fil
raise Exception("Can't find xmlsec1")
-
-def pytest_funcarg__AVA(request):
+
+@pytest.fixture
+def AVA(request):
return [
{
"surName": ["Jeter"],
@@ -27,4 +30,4 @@ def pytest_funcarg__AVA(request):
"surName": ["Hedberg"],
"givenName": ["Roland"],
},
- ]
+ ]