Merge remote-tracking branch 'upstream/master' into doctest-lineno

2017-07-24 21:49:35 +07:00
parent af2c153324 81ad185f0d
commit cdaa720bc4
11 changed files with 158 additions and 43 deletions
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -1079,7 +1079,6 @@ class Config(object):
        self.pluginmanager.load_setuptools_entrypoints('pytest11')
        self.pluginmanager.consider_env()
        self.known_args_namespace = ns = self._parser.parse_known_args(args, namespace=self.option.copy())
-        confcutdir = self.known_args_namespace.confcutdir
        if self.known_args_namespace.confcutdir is None and self.inifile:
            confcutdir = py.path.local(self.inifile).dirname
            self.known_args_namespace.confcutdir = confcutdir