p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use shlex to split the arguments from PYTEST_ADDOPTS. 

--HG--
branch : env-addopts
This commit is contained in:
Dave Hunt 2015-01-26 10:39:21 +00:00
parent 7325a5fe2e
commit 8f12269db7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_pytest/config.py
View File

@ -705,8 +705,7 @@ class Config(object):
def _preparse(self, args, addopts=True): def _preparse(self, args, addopts=True):
self._initini(args) self._initini(args)
if addopts: if addopts:
env_addopts = os.environ.get('PYTEST_ADDOPTS', '') args[:] = shlex.split(os.environ.get('PYTEST_ADDOPTS', '')) + args
args[:] = env_addopts.replace('"', '').split() + args
args[:] = self.getini("addopts") + args args[:] = self.getini("addopts") + args
self._checkversion() self._checkversion()
self.pluginmanager.consider_preparse(args) self.pluginmanager.consider_preparse(args)