From 74bc50e97cc8b1d85bec8f11ce84df698270f07a Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 15 Jul 2015 20:45:35 -0300 Subject: [PATCH] Fix flakes --- testing/test_tmpdir.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testing/test_tmpdir.py b/testing/test_tmpdir.py index edc010906..7c2095e6e 100644 --- a/testing/test_tmpdir.py +++ b/testing/test_tmpdir.py @@ -1,7 +1,7 @@ import py import pytest -from _pytest.tmpdir import tmpdir, TempdirFactory +from _pytest.tmpdir import tmpdir def test_funcarg(testdir): testdir.makepyfile(""" @@ -10,6 +10,7 @@ def test_funcarg(testdir): metafunc.addcall(id='b') def test_func(tmpdir): pass """) + from _pytest.tmpdir import TempdirFactory reprec = testdir.inline_run() calls = reprec.getcalls("pytest_runtest_setup") item = calls[0].item @@ -35,6 +36,7 @@ def test_ensuretemp(recwarn): class TestTempdirHandler: def test_mktemp(self, testdir): + from _pytest.tmpdir import TempdirFactory config = testdir.parseconfig() config.option.basetemp = testdir.mkdir("hello") t = TempdirFactory(config)