From c8264385eabc1c6d3ff85d63f7da1ab5ff3e4d7d Mon Sep 17 00:00:00 2001 From: "christian@christian-linux.sarrazin.local" Date: Fri, 27 Jun 2014 17:42:37 +0200 Subject: [PATCH 1/2] Implement the "-c" command line switch that allows to explicitly specifiy the config file to load. This feature was requested in issue #174. --HG-- branch : explicit-ini-filename --- _pytest/config.py | 8 ++++++++ _pytest/main.py | 3 +++ testing/test_config.py | 15 +++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/_pytest/config.py b/_pytest/config.py index 837da7f21..9f579a7a9 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -833,6 +833,14 @@ def exists(path, ignore=EnvironmentError): return False def getcfg(args, inibasenames): + if "-c" in args: + n = len(args) + for i in range(1, n): + if args[i - 1] == "-c" and not str(args[i]).startswith("-"): + iniconfig = py.iniconfig.IniConfig(args[i]) + if 'pytest' in iniconfig.sections: + return iniconfig['pytest'] + return {} args = [x for x in args if not str(x).startswith("-")] if not args: args = [py.path.local()] diff --git a/_pytest/main.py b/_pytest/main.py index 246470f01..011e43275 100644 --- a/_pytest/main.py +++ b/_pytest/main.py @@ -38,6 +38,9 @@ def pytest_addoption(parser): help="exit after first num failures or errors.") group._addoption('--strict', action="store_true", help="run pytest in strict mode, warnings become errors.") + # This option is never used as such, see config.getcfg(). + group._addoption("-c", metavar="file", type=str, dest="_inifilename", + help="load configuration from `file` instead of trying to locate one of the implicit configuration files.") group = parser.getgroup("collect", "collection") group.addoption('--collectonly', '--collect-only', action="store_true", diff --git a/testing/test_config.py b/testing/test_config.py index c25de6ea4..aa96c1d56 100644 --- a/testing/test_config.py +++ b/testing/test_config.py @@ -79,6 +79,21 @@ class TestConfigCmdlineParsing: config = testdir.parseconfig() pytest.raises(AssertionError, lambda: config.parse([])) + def test_explicitly_specified_config_file_is_loaded(self, testdir): + testdir.makeconftest(""" + def pytest_addoption(parser): + parser.addini("custom", "") + """) + testdir.makeini(""" + [pytest] + custom = 0 + """) + testdir.makefile(".cfg", custom = """ + [pytest] + custom = 1 + """) + config = testdir.parseconfig("-c", "custom.cfg") + assert config.getini("custom") == "1" class TestConfigAPI: def test_config_trace(self, testdir): From b7f6a9f3fd02dd40424112f2bc13574d0dcb9065 Mon Sep 17 00:00:00 2001 From: Christian Henz Date: Sat, 28 Jun 2014 12:03:55 +0200 Subject: [PATCH 2/2] Cleaner implementation of early handling of the '-c' command line switch. --HG-- branch : explicit-ini-filename --- _pytest/config.py | 18 +++++++++--------- _pytest/main.py | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/_pytest/config.py b/_pytest/config.py index 9f579a7a9..755fdeb23 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -685,7 +685,15 @@ class Config(object): pytest_load_initial_conftests.trylast = True def _initini(self, args): - self.inicfg = getcfg(args, ["pytest.ini", "tox.ini", "setup.cfg"]) + parsed_args = self._parser.parse_known_args(args) + if parsed_args.inifilename: + iniconfig = py.iniconfig.IniConfig(parsed_args.inifilename) + if 'pytest' in iniconfig.sections: + self.inicfg = iniconfig['pytest'] + else: + self.inicfg = {} + else: + self.inicfg = getcfg(args, ["pytest.ini", "tox.ini", "setup.cfg"]) self._parser.addini('addopts', 'extra command line options', 'args') self._parser.addini('minversion', 'minimally required pytest version') @@ -833,14 +841,6 @@ def exists(path, ignore=EnvironmentError): return False def getcfg(args, inibasenames): - if "-c" in args: - n = len(args) - for i in range(1, n): - if args[i - 1] == "-c" and not str(args[i]).startswith("-"): - iniconfig = py.iniconfig.IniConfig(args[i]) - if 'pytest' in iniconfig.sections: - return iniconfig['pytest'] - return {} args = [x for x in args if not str(x).startswith("-")] if not args: args = [py.path.local()] diff --git a/_pytest/main.py b/_pytest/main.py index 011e43275..7b61d8114 100644 --- a/_pytest/main.py +++ b/_pytest/main.py @@ -38,8 +38,7 @@ def pytest_addoption(parser): help="exit after first num failures or errors.") group._addoption('--strict', action="store_true", help="run pytest in strict mode, warnings become errors.") - # This option is never used as such, see config.getcfg(). - group._addoption("-c", metavar="file", type=str, dest="_inifilename", + group._addoption("-c", metavar="file", type=str, dest="inifilename", help="load configuration from `file` instead of trying to locate one of the implicit configuration files.") group = parser.getgroup("collect", "collection")