summaryrefslogtreecommitdiff
path: root/testing/test_conftest.py
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2015-07-15 20:03:58 -0300
committerBruno Oliveira <nicoddemus@gmail.com>2015-07-15 20:03:58 -0300
commit0f52856f995e42ac5f337bd82dd5179cea5214a1 (patch)
treef7e44c980497bec57fce24eedec897e32f408441 /testing/test_conftest.py
parent8f4f2c665d247d47b904ebf3bbd2b1c93c0e1ef2 (diff)
downloadpytest-0f52856f995e42ac5f337bd82dd5179cea5214a1.tar.gz
Use a subdirectory in the TEMP directory to speed up tmpdir creation
Fix #105
Diffstat (limited to 'testing/test_conftest.py')
-rw-r--r--testing/test_conftest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/test_conftest.py b/testing/test_conftest.py
index 4791d6f61..513ba43a5 100644
--- a/testing/test_conftest.py
+++ b/testing/test_conftest.py
@@ -4,9 +4,9 @@ from _pytest.config import PytestPluginManager
@pytest.fixture(scope="module", params=["global", "inpackage"])
-def basedir(request):
+def basedir(request, tmpdir_factory):
from _pytest.tmpdir import tmpdir
- tmpdir = tmpdir(request)
+ tmpdir = tmpdir(request, tmpdir_factory)
tmpdir.ensure("adir/conftest.py").write("a=1 ; Directory = 3")
tmpdir.ensure("adir/b/conftest.py").write("b=2 ; a = 1.5")
if request.param == "inpackage":