get PYTEST_ADDOPTS before calling _initini

ceridwen · Oct 19, 2017 · 52e904e · 52e904e
1 parent a2933e9
commit 52e904e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/_pytest/config.py b/_pytest/config.py
@@ -1055,9 +1055,10 @@ def _warn_about_missing_assertion(self, mode):
                                  "(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)