fixing tests

.gitlab-ci.yml

@@ -19,7 +19,7 @@ variables:
 #    selected, manually enter the key value pair using the format in this example: CUSTOM_RUN_DATE 20230115"
 
   CUSTOM_RUN_DATE:
-    value: "20240702"
+    value: "20240715"
     description: "Full-fat tests will pull data from the deployment environment. For robustness, the default option is a
     pre-selected date we know works. To override the default date, manually enter the key value pair using the format 
     in this example e.g.: CUSTOM_RUN_DATE 20230115 - NOTE THAT IF YOU SELECT A CUSTOM DATE BEFORE THE CURRENT 

tests/integration/full/full_test_epi.py

@@ -2,20 +2,15 @@ import copy
 import os
 import sys
 
-from ews.coordinator.processor_deposition import ProcessorDeposition
-from ews.coordinator.processor_environment import ProcessorEnvironment
 from ews.coordinator.processor_epidemiology import ProcessorEpidemiology
 from ews.coordinator.utils.processor_utils import parse_json_file_with_tokens
 from integration.partial.integration_test_utils import IntegrationTestUtils
-from integration.test_suites.depo_test_suite import BaseDepoTestSuite
-from integration.test_suites.env_suit_test_suite import BaseEnvSuitTestSuite
 from integration.test_suites.epi_test_suite import BaseEpiTestSuite
 
 
 class FullTestEpi(BaseEpiTestSuite.EpiTestSuite):
 
     def set_expected_values(self):
-        # nothing to override here
         pass
 
 
@@ -27,7 +22,6 @@ class FullTestEpi(BaseEpiTestSuite.EpiTestSuite):
                 or not os.path.exists(IntegrationTestUtils.TEST_JOB_DIR):
             # if True:
             FullTestEpi.write_temp_run_config_files()
-            # FullTestEpi.run_dependent_pipelines()
             FullTestEpi.run_epi_pipeline()
         else:
             print(f"output in {IntegrationTestUtils.TEST_JOB_DIR} already written, skipping rerun")
@@ -35,16 +29,6 @@ class FullTestEpi(BaseEpiTestSuite.EpiTestSuite):
 
     @staticmethod
     def write_temp_run_config_files():
-        # default_config = IntegrationTestUtils.DEFAULT_CONFIG_FILE_PATH
-        # default_config_dict: dict = IntegrationTestUtils.load_json_file(default_config)
-        # run_dict: dict = copy.deepcopy(default_config_dict)
-        #
-        #
-        # # may be reusing a non-timestamped output file during development, so allow extant TEST_OUT_PATH
-        # 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)
-
         """
         IntegrationTestUtils.RUN_SYS_CONFIG_FILE_PATH will have been set from the command line args, and point to the
         production sys config file. We need to modify this file to point to the test output directory.
@@ -94,22 +78,6 @@ class FullTestEpi(BaseEpiTestSuite.EpiTestSuite):
         IntegrationTestUtils.RUN_CONFIG_FILE_PATH = job_run_config_file
 
 
-    @staticmethod
-    def run_dependent_pipelines():
-        depo_processor = ProcessorDeposition()
-        IntegrationTestUtils.run_external_pipeline(BaseDepoTestSuite.DepoTestSuite.DEPO_COMPONENT_NAME,
-                                                   BaseDepoTestSuite.DepoTestSuite.DEPO_PROCESSOR_DIR,
-                                                   IntegrationTestUtils.TEST_START_DATE,
-                                                   depo_processor)
-
-        env_processor = ProcessorEnvironment()
-        IntegrationTestUtils.run_external_pipeline(BaseEnvSuitTestSuite.EnvSuitTestSuite.ENV_COMPONENT_NAME,
-                                                   BaseEnvSuitTestSuite.EnvSuitTestSuite.ENV_PROCESSOR_DIR,
-                                                   IntegrationTestUtils.TEST_START_DATE,
-                                                   env_processor)
-
-        pass
-
     @staticmethod
     def run_epi_pipeline():
         epi_processor = ProcessorEpidemiology()