summaryrefslogtreecommitdiff
path: root/testing/test_conftest.py
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2012-10-05 14:24:44 +0200
committerholger krekel <holger@merlinux.eu>2012-10-05 14:24:44 +0200
commitbb07ba78073cb738fe858a5fe8f09993dbd805d3 (patch)
treebe20276eb244883b7c35cbd2159ea6346751ed47 /testing/test_conftest.py
parent8282efbb4041705a0ef169a07cd08f95c8809dc3 (diff)
downloadpytest-bb07ba78073cb738fe858a5fe8f09993dbd805d3.tar.gz
rename a number of internal and externally visible variables to use the fixture name
rather than funcargs. Introduce .funcargnames compatibility attribute for backward compat.
Diffstat (limited to 'testing/test_conftest.py')
-rw-r--r--testing/test_conftest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/test_conftest.py b/testing/test_conftest.py
index d4ec62bb8..6b9689fe3 100644
--- a/testing/test_conftest.py
+++ b/testing/test_conftest.py
@@ -2,7 +2,7 @@ import py, pytest
from _pytest.config import Conftest
def pytest_generate_tests(metafunc):
- if "basedir" in metafunc.funcargnames:
+ if "basedir" in metafunc.fixturenames:
metafunc.addcall(param="global")
metafunc.addcall(param="inpackage")