jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid creating arbitrary filenames for tmpdir on Testdir's constructor 

Fixes #2751
This commit is contained in:
Tarcisio Fischer 2017-09-05 15:22:04 -03:00
parent 9d373d83ac
commit 8d1903fed3
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/pytester.py
View File

@ -412,16 +412,8 @@ class Testdir:
def __init__(self, request, tmpdir_factory): def __init__(self, request, tmpdir_factory):
self.request = request self.request = request
self._mod_collections = WeakKeyDictionary() self._mod_collections = WeakKeyDictionary()
# XXX remove duplication with tmpdir plugin
basetmp = tmpdir_factory.ensuretemp("testdir")
name = request.function.__name__ name = request.function.__name__
for i in range(100): self.tmpdir = tmpdir_factory.mktemp(name, numbered=True)
try:
tmpdir = basetmp.mkdir(name + str(i))
except py.error.EEXIST:
continue
break
self.tmpdir = tmpdir
self.plugins = [] self.plugins = []
self._savesyspath = (list(sys.path), list(sys.meta_path)) self._savesyspath = (list(sys.path), list(sys.meta_path))
self._savemodulekeys = set(sys.modules) self._savemodulekeys = set(sys.modules)

1
testing/test_collection.py
View File

@ -569,7 +569,6 @@ class Test_getinitialnodes(object):
col = testdir.getnode(config, x) col = testdir.getnode(config, x)
assert isinstance(col, pytest.Module) assert isinstance(col, pytest.Module)
assert col.name == 'x.py' assert col.name == 'x.py'
assert col.parent.name == testdir.tmpdir.basename
assert col.parent.parent is None assert col.parent.parent is None
for col in col.listchain(): for col in col.listchain():
assert col.config is config assert col.config is config