From 555a4418352a18f7a5c8bf677d52d819cdf4fc46 Mon Sep 17 00:00:00 2001 From: lb584 <lb584@cam.ac.uk> Date: Tue, 18 Jul 2023 11:15:46 +0100 Subject: [PATCH] investigating failing env suit full fat failure --- tests/integration/full/full_test_env_suit.py | 7 ++- .../partial/integration_test_utils.py | 53 +++++++++---------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/tests/integration/full/full_test_env_suit.py b/tests/integration/full/full_test_env_suit.py index 256df77..b5bd5bc 100644 --- a/tests/integration/full/full_test_env_suit.py +++ b/tests/integration/full/full_test_env_suit.py @@ -46,10 +46,9 @@ class FullTestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite): @staticmethod def run_env_pipeline(): - # IntegrationTestUtils.run_external_pipeline(BaseEnvSuitTestSuite.EnvSuitTestSuite.ENV_COMPONENT_NAME, - # IntegrationTestUtils.TEST_START_DATE, - # IntegrationTestUtils.EMAIL_CRED_PATH) - pass + IntegrationTestUtils.run_external_pipeline(BaseEnvSuitTestSuite.EnvSuitTestSuite.ENV_COMPONENT_NAME, + IntegrationTestUtils.TEST_START_DATE, + IntegrationTestUtils.EMAIL_CRED_PATH) if __name__ == '__main__': _success: bool = IntegrationTestUtils.run_full_integration_test_pipeline(FullTestEnvSuit, diff --git a/tests/integration/partial/integration_test_utils.py b/tests/integration/partial/integration_test_utils.py index 8ce75a8..2871e89 100644 --- a/tests/integration/partial/integration_test_utils.py +++ b/tests/integration/partial/integration_test_utils.py @@ -197,38 +197,35 @@ class IntegrationTestUtils: email_cred_path: str, **kwargs): - print("running external pipeline1") # need EMAIL_CRED in the environment before we import Processor os.environ["EMAIL_CRED"] = email_cred_path - print("running external pipeline2") - - import Processor - reload(Processor) # reload the class to reset all variables - from Processor import run_Process, set_log_level - print("running external pipeline3") - - args_dict: dict = {} + # import Processor + # reload(Processor) # reload the class to reset all variables + # from Processor import run_Process, set_log_level + # + # args_dict: dict = {} + # # note, possible to override these values in the kwargs loop below - args_dict['live'] = False - args_dict['noupload'] = True - args_dict['start_date'] = start_date - args_dict['component'] = component - args_dict['config_paths'] = [IntegrationTestUtils.TEMP_CONFIG_FILE_NAME] - args_dict['log_level'] = 'info' - args_dict['clearup'] = True - - for key, value in kwargs.items(): - args_dict[key] = value - - log_level = args_dict['log_level'] - set_log_level(log_level) - - try: - run_Process(args_dict) - except SystemExit: - # we will eventually want to throw these to the calling class to be dealt with - pass + # args_dict['live'] = False + # args_dict['noupload'] = True + # args_dict['start_date'] = start_date + # args_dict['component'] = component + # args_dict['config_paths'] = [IntegrationTestUtils.TEMP_CONFIG_FILE_NAME] + # args_dict['log_level'] = 'info' + # args_dict['clearup'] = True + # + # for key, value in kwargs.items(): + # args_dict[key] = value + # + # log_level = args_dict['log_level'] + # set_log_level(log_level) + # + # try: + # run_Process(args_dict) + # except SystemExit: + # we will eventually want to throw these to the calling class to be dealt with + # pass @staticmethod -- GitLab