diff --git a/tests/integration/full/full_test_env_suit.py b/tests/integration/full/full_test_env_suit.py index 2c3e8295eac541fed1c393973afbf795ce49ab1d..ba9c0e73833efdcc2427ad6cb9e3341753886271 100644 --- a/tests/integration/full/full_test_env_suit.py +++ b/tests/integration/full/full_test_env_suit.py @@ -3,6 +3,7 @@ import os import sys from ews.coordinator.processor_environment import ProcessorEnvironment +from ews.coordinator.utils.processor_utils import parse_json_file_with_tokens from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.env_suit_test_suite import BaseEnvSuitTestSuite @@ -30,24 +31,27 @@ class FullTestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite): @staticmethod def write_temp_run_config_file(): - sys_config_path = IntegrationTestUtils.DEFAULT_SYS_CONFIG_FILE_PATH - sys_config_dict: dict = IntegrationTestUtils.load_json_file(sys_config_path) + sys_config = IntegrationTestUtils.RUN_SYS_CONFIG_FILE_PATH + sys_config_dict: dict = parse_json_file_with_tokens(sys_config) sys_config_dict['WorkspacePathout'] = IntegrationTestUtils.TEST_OUT_PATH sys_config_dict['WorkspacePath'] = IntegrationTestUtils.TEST_OUT_PATH - IntegrationTestUtils.RUN_SYS_CONFIG_FILE_PATH = IntegrationTestUtils.TEST_OUT_PATH + "temp_sys_config.json" - IntegrationTestUtils.write_json_file(sys_config_dict, IntegrationTestUtils.RUN_SYS_CONFIG_FILE_PATH) - default_config = IntegrationTestUtils.DEFAULT_ENV_SUIT_CONFIG_FILE_PATH - default_config_dict: dict = IntegrationTestUtils.load_json_file(default_config) - run_dict: dict = copy.deepcopy(default_config_dict) + os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True) + job_sys_config_file = IntegrationTestUtils.TEST_OUT_PATH + "temp_sys_config.json" + IntegrationTestUtils.write_json_file(sys_config_dict, job_sys_config_file) + + # now set the sys config file path to the new job-specific file + IntegrationTestUtils.RUN_SYS_CONFIG_FILE_PATH = job_sys_config_file + + run_config = IntegrationTestUtils.RUN_CONFIG_FILE_PATH + run_config_temp_dict: dict = IntegrationTestUtils.load_json_file(run_config) + run_dict: dict = copy.deepcopy(run_config_temp_dict) run_dict['WORK_PATH'] = IntegrationTestUtils.TEST_OUT_PATH run_dict['INPUT_PATH'] = IntegrationTestUtils.TEST_OUT_PATH run_dict['OUTPUT_PATH'] = IntegrationTestUtils.TEST_OUT_PATH run_dict['EWS-Plotting']['Ethiopia']['FilterForCountry'] = "True" run_dict['EWS-Plotting']['Kenya']['FilterForCountry'] = "True" - os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True) - IntegrationTestUtils.RUN_CONFIG_FILE_PATH = IntegrationTestUtils.TEST_OUT_PATH + "temp_config.json" IntegrationTestUtils.write_json_file(run_dict, IntegrationTestUtils.RUN_CONFIG_FILE_PATH)