floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor: getbasetemp: dedent, improve assert

This commit is contained in:
Daniel Hahler 2019-05-28 18:25:45 +02:00
parent 6061ecf95a
commit 97d8e9fbec
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/_pytest/tmpdir.py
View File

@ -60,7 +60,9 @@ class TempPathFactory(object):
def getbasetemp(self): def getbasetemp(self):
""" return base temporary directory. """ """ return base temporary directory. """
if self._basetemp is None: if self._basetemp is not None:
return self._basetemp
if self._given_basetemp is not None: if self._given_basetemp is not None:
basetemp = self._given_basetemp basetemp = self._given_basetemp
ensure_reset_dir(basetemp) ensure_reset_dir(basetemp)
@ -76,12 +78,10 @@ class TempPathFactory(object):
basetemp = make_numbered_dir_with_cleanup( basetemp = make_numbered_dir_with_cleanup(
prefix="pytest-", root=rootdir, keep=3, lock_timeout=LOCK_TIMEOUT prefix="pytest-", root=rootdir, keep=3, lock_timeout=LOCK_TIMEOUT
) )
assert basetemp is not None assert basetemp is not None, basetemp
self._basetemp = t = basetemp self._basetemp = t = basetemp
self._trace("new basetemp", t) self._trace("new basetemp", t)
return t return t
else:
return self._basetemp
@attr.s @attr.s