Merge pull request #975 from nicoddemus/fix-regression-parse-known-args

Fix regression caused by changing the signature for parse_known_args

Author: nicoddemus

_pytest/config.py

@@ -477,6 +477,15 @@ def parse_setoption(self, args, option):
         return getattr(parsedoption, FILE_OR_DIR)
 
     def parse_known_args(self, args):
+        """parses and returns a namespace object with known arguments at this
+        point.
+        """
+        return self.parse_known_and_unknown_args(args)[0]
+
+    def parse_known_and_unknown_args(self, args):
+        """parses and returns a namespace object with known arguments, and
+        the remaining arguments unknown at this point.
+        """
         optparser = self._getparser()
         args = [str(x) for x in args]
         return optparser.parse_known_args(args)
@@ -879,9 +888,8 @@ def pytest_load_initial_conftests(self, early_config):
         self.pluginmanager._set_initial_conftests(early_config.known_args_namespace)
 
     def _initini(self, args):
-        parsed_args, extra_args = self._parser.parse_known_args(args)
-        r = determine_setup(parsed_args.inifilename,
-                            parsed_args.file_or_dir + extra_args)
+        ns, unknown_args = self._parser.parse_known_and_unknown_args(args)
+        r = determine_setup(ns.inifilename, ns.file_or_dir + unknown_args)
         self.rootdir, self.inifile, self.inicfg = r
         self._parser.extra_info['rootdir'] = self.rootdir
         self._parser.extra_info['inifile'] = self.inifile
@@ -901,8 +909,7 @@ def _preparse(self, args, addopts=True):
         except ImportError as e:
             self.warn("I2", "could not load setuptools entry import: %s" % (e,))
         self.pluginmanager.consider_env()
-        ns, _ = self._parser.parse_known_args(args)
-        self.known_args_namespace = ns
+        self.known_args_namespace = ns = self._parser.parse_known_args(args)
         if self.known_args_namespace.confcutdir is None and self.inifile:
             confcutdir = py.path.local(self.inifile).dirname
             self.known_args_namespace.confcutdir = confcutdir

testing/test_parseopt.py

@@ -105,10 +105,17 @@ def test_parse2(self, parser):
     def test_parse_known_args(self, parser):
         parser.parse_known_args([py.path.local()])
         parser.addoption("--hello", action="store_true")
-        ns, extra_args = parser.parse_known_args(["x", "--y", "--hello", "this"])
+        ns = parser.parse_known_args(["x", "--y", "--hello", "this"])
         assert ns.hello
         assert ns.file_or_dir == ['x']
-        assert extra_args == ['--y', 'this']
+
+    def test_parse_known_and_unknown_args(self, parser):
+        parser.addoption("--hello", action="store_true")
+        ns, unknown = parser.parse_known_and_unknown_args(["x", "--y",
+                                                           "--hello", "this"])
+        assert ns.hello
+        assert ns.file_or_dir == ['x']
+        assert unknown == ['--y', 'this']
 
     def test_parse_will_set_default(self, parser):
         parser.addoption("--hello", dest="hello", default="x", action="store")