floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Paths after normal options are now properly used to discover rootdir and ini files

Browse Source 
Fix #949
This commit is contained in:
Bruno Oliveira
2015-08-25 22:08:05 -03:00
parent b25e41e348
commit 42b43a7d7b
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/config.py
View File

@@ -479,7 +479,7 @@ class Parser:
def parse_known_args(self, args):
optparser = self._getparser()
args = [str(x) for x in args]
return optparser.parse_known_args(args)[0]
return optparser.parse_known_args(args)
def addini(self, name, help, type=None, default=None):
""" register an ini-file option.
@@ -879,8 +879,9 @@ class Config(object):
self.pluginmanager._set_initial_conftests(early_config.known_args_namespace)
def _initini(self, args):
parsed_args = self._parser.parse_known_args(args)
r = determine_setup(parsed_args.inifilename, parsed_args.file_or_dir)
parsed_args, extra_args = self._parser.parse_known_args(args)
r = determine_setup(parsed_args.inifilename,
parsed_args.file_or_dir + extra_args)
self.rootdir, self.inifile, self.inicfg = r
self._parser.extra_info['rootdir'] = self.rootdir
self._parser.extra_info['inifile'] = self.inifile
@@ -900,7 +901,8 @@ class Config(object):
except ImportError as e:
self.warn("I2", "could not load setuptools entry import: %s" % (e,))
self.pluginmanager.consider_env()
self.known_args_namespace = ns = self._parser.parse_known_args(args)
ns, _ = self._parser.parse_known_args(args)
self.known_args_namespace = ns
if self.known_args_namespace.confcutdir is None and self.inifile:
confcutdir = py.path.local(self.inifile).dirname
self.known_args_namespace.confcutdir = confcutdir