From 80ba56d83c248abec6e2dd3bb01bba43be888ae7 Mon Sep 17 00:00:00 2001 From: Vaclav Petras Date: Mon, 7 Feb 2022 22:11:20 -0500 Subject: [PATCH] grass.gunittest: Add --config parameter A configuration file can now be specified explicitly in the command line which is useful for providing custom configuration file, e.g., with more or less tests excluded or with differnt timeout for different platfroms or hardware setups. Removes a useless return from the config function. Reports OSErrors from the function without traceback. --- python/grass/gunittest/main.py | 38 ++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/python/grass/gunittest/main.py b/python/grass/gunittest/main.py index 416489bf498..ee8641cb581 100644 --- a/python/grass/gunittest/main.py +++ b/python/grass/gunittest/main.py @@ -131,18 +131,28 @@ def discovery(): CONFIG_FILENAME = ".gunittest.cfg" -def get_config(start_directory): - """Read configuration if available, return empty dict if not""" +def get_config(start_directory, config_file): + """Read configuration if available, return empty section proxy if not + + If file is explicitly specified, it must exist. + + Raises OSError if file is not accessible, e.g., if it exists, + but there is an issue with permissions. + """ config_parser = configparser.ConfigParser() - config_file = Path(start_directory) / CONFIG_FILENAME - if config_file.is_file(): + if config_file: + with open(config_file, encoding="utf-8") as file: + config_parser.read_file(file) + elif start_directory: + config_file = Path(start_directory) / CONFIG_FILENAME + # Does not check presence of the file config_parser.read(config_file) else: - # Create an empty section if file is not available. + raise ValueError("Either start_directory or config_file must be set") + if "gunittest" not in config_parser: + # Create an empty section if file is not available or section is not present. config_parser.read_dict({"gunittest": {}}) - if "gunittest" in config_parser: - return config_parser["gunittest"] - return config_parser + return config_parser["gunittest"] def main(): @@ -190,6 +200,13 @@ def main(): " than this will result in a non-zero return code; values 0-100)" ), ) + parser.add_argument( + "--config", + dest="config", + action="store", + type=str, + help=f"Path to a configuration file (default: {CONFIG_FILENAME})", + ) args = parser.parse_args() gisdbase = args.gisdbase if gisdbase is None: @@ -222,7 +239,10 @@ def main(): start_dir = "." abs_start_dir = os.path.abspath(start_dir) - config = get_config(start_dir) + try: + config = get_config(start_directory=start_dir, config_file=args.config) + except OSError as error: + return f"Error reading configuration: {error}" invoker = GrassTestFilesInvoker( start_dir=start_dir,