From 2aa770a5edb8ee8d751a21f4510ea2cc1449aa87 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Fri, 17 Apr 2020 15:17:45 +0200 Subject: [PATCH] Change order conf files are imported Let system config file are read before current dir ones to ensure system options can be overrided by config file in test cases directory. Change-Id: If955d4725045e244ea544b8ddc04b0f7291c0655 --- tobiko/config.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tobiko/config.py b/tobiko/config.py index e3a8099ce..c0375c193 100644 --- a/tobiko/config.py +++ b/tobiko/config.py @@ -141,10 +141,10 @@ def init_tobiko_config(default_config_dirs=None, default_config_files=None, if default_config_dirs is None: default_config_dirs = cfg.find_config_dirs(project=project, prog=prog) if default_config_files is None: - default_config_files = (workspace_config_files(project=project, - prog=prog) + - cfg.find_config_files(project=project, - prog=prog)) + default_config_files = (cfg.find_config_files(project=project, + prog=prog) + + workspace_config_files(project=project, + prog=prog)) # Register configuration options conf = cfg.ConfigOpts() @@ -174,10 +174,13 @@ def init_tobiko_config(default_config_dirs=None, default_config_files=None, " - product_name: %r\n" " - version: %r\n" " - default_config_dirs: %r\n" - " - default_config_files: %r\n", + " - default_config_files: %r\n" + " - log_file: %r\n", product_name, version, - default_config_dirs, default_config_files) + default_config_dirs, + default_config_files, + os.path.join(log_dir, log_file)) def register_tobiko_options(conf):