Extract get_user logic into a separate function
This commit is contained in:
parent
6676aeda5a
commit
1150e87e31
|
@ -54,13 +54,8 @@ class TempdirFactory:
|
||||||
else:
|
else:
|
||||||
# use a sub-directory in the temproot to speed-up
|
# use a sub-directory in the temproot to speed-up
|
||||||
# make_numbered_dir() call
|
# make_numbered_dir() call
|
||||||
import getpass
|
|
||||||
temproot = py.path.local.get_temproot()
|
temproot = py.path.local.get_temproot()
|
||||||
try:
|
rootdir = temproot.join('pytest-of-%s' % get_user())
|
||||||
rootdir = temproot.join('pytest-of-%s' % getpass.getuser())
|
|
||||||
except ImportError:
|
|
||||||
# see issue #1010
|
|
||||||
rootdir = temproot.join('pytest-tox')
|
|
||||||
rootdir.ensure(dir=1)
|
rootdir.ensure(dir=1)
|
||||||
basetemp = py.path.local.make_numbered_dir(prefix='pytest-',
|
basetemp = py.path.local.make_numbered_dir(prefix='pytest-',
|
||||||
rootdir=rootdir)
|
rootdir=rootdir)
|
||||||
|
@ -71,6 +66,18 @@ class TempdirFactory:
|
||||||
def finish(self):
|
def finish(self):
|
||||||
self.trace("finish")
|
self.trace("finish")
|
||||||
|
|
||||||
|
|
||||||
|
def get_user():
|
||||||
|
"""Return the current user name, falling back to using "tox" as user name
|
||||||
|
because getpass relies on environment variables which might not be
|
||||||
|
available in a tox environment (see #1010).
|
||||||
|
"""
|
||||||
|
import getpass
|
||||||
|
try:
|
||||||
|
return getpass.getuser()
|
||||||
|
except ImportError:
|
||||||
|
return 'tox'
|
||||||
|
|
||||||
# backward compatibility
|
# backward compatibility
|
||||||
TempdirHandler = TempdirFactory
|
TempdirHandler = TempdirFactory
|
||||||
|
|
||||||
|
|
|
@ -133,3 +133,13 @@ def test_tmpdir_fallback_tox_env(testdir, monkeypatch):
|
||||||
""")
|
""")
|
||||||
reprec = testdir.inline_run()
|
reprec = testdir.inline_run()
|
||||||
reprec.assertoutcome(passed=1)
|
reprec.assertoutcome(passed=1)
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_user(monkeypatch):
|
||||||
|
"""Test that get_user() function works even if environment variables
|
||||||
|
required by getpass module are missing from the environment (#1010).
|
||||||
|
"""
|
||||||
|
from _pytest.tmpdir import get_user
|
||||||
|
monkeypatch.delenv('USER', raising=False)
|
||||||
|
monkeypatch.delenv('USERNAME', raising=False)
|
||||||
|
assert get_user() == 'tox'
|
||||||
|
|
Loading…
Reference in New Issue