From 8f12269db7f03760ba0ba5bb2d291ab219c5461d Mon Sep 17 00:00:00 2001 From: Dave Hunt Date: Mon, 26 Jan 2015 10:39:21 +0000 Subject: [PATCH] Use shlex to split the arguments from PYTEST_ADDOPTS. --HG-- branch : env-addopts --- _pytest/config.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_pytest/config.py b/_pytest/config.py index 0d9beb3d3..f4be2d062 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -705,8 +705,7 @@ class Config(object): def _preparse(self, args, addopts=True): self._initini(args) if addopts: - env_addopts = os.environ.get('PYTEST_ADDOPTS', '') - args[:] = env_addopts.replace('"', '').split() + args + args[:] = shlex.split(os.environ.get('PYTEST_ADDOPTS', '')) + args args[:] = self.getini("addopts") + args self._checkversion() self.pluginmanager.consider_preparse(args)