From 8d1903fed386e5d2060c8a61339f0dd9d4df3b8f Mon Sep 17 00:00:00 2001 From: Tarcisio Fischer Date: Tue, 5 Sep 2017 15:22:04 -0300 Subject: [PATCH] Avoid creating arbitrary filenames for tmpdir on Testdir's constructor Fixes #2751 --- _pytest/pytester.py | 10 +--------- testing/test_collection.py | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/_pytest/pytester.py b/_pytest/pytester.py index fc9b8d9cb..573640014 100644 --- a/_pytest/pytester.py +++ b/_pytest/pytester.py @@ -412,16 +412,8 @@ class Testdir: def __init__(self, request, tmpdir_factory): self.request = request self._mod_collections = WeakKeyDictionary() - # XXX remove duplication with tmpdir plugin - basetmp = tmpdir_factory.ensuretemp("testdir") name = request.function.__name__ - for i in range(100): - try: - tmpdir = basetmp.mkdir(name + str(i)) - except py.error.EEXIST: - continue - break - self.tmpdir = tmpdir + self.tmpdir = tmpdir_factory.mktemp(name, numbered=True) self.plugins = [] self._savesyspath = (list(sys.path), list(sys.meta_path)) self._savemodulekeys = set(sys.modules) diff --git a/testing/test_collection.py b/testing/test_collection.py index 5d1654410..ab0c93bae 100644 --- a/testing/test_collection.py +++ b/testing/test_collection.py @@ -569,7 +569,6 @@ class Test_getinitialnodes(object): col = testdir.getnode(config, x) assert isinstance(col, pytest.Module) assert col.name == 'x.py' - assert col.parent.name == testdir.tmpdir.basename assert col.parent.parent is None for col in col.listchain(): assert col.config is config