From 66e9a794726fd4ba6dc7e28962cdb46b46297e9b Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Tue, 10 Oct 2017 07:56:46 -0700 Subject: [PATCH] get PYTEST_ADDOPTS before calling _initini --- _pytest/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_pytest/config.py b/_pytest/config.py index 2f28bb7bf..1c0cd185d 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -1055,9 +1055,10 @@ class Config(object): "(are you using python -O?)\n") def _preparse(self, args, addopts=True): - self._initini(args) if addopts: args[:] = shlex.split(os.environ.get('PYTEST_ADDOPTS', '')) + args + self._initini(args) + if addopts: args[:] = self.getini("addopts") + args self._checkversion() self._consider_importhook(args)