diff --git a/coordinator/ProcessorEnvironment.py b/coordinator/ProcessorEnvironment.py index c90530bf4465440baae3ad8f0c75c70bd619b77c..d3b70db74b8101542db4a3089e89901e40082659 100644 --- a/coordinator/ProcessorEnvironment.py +++ b/coordinator/ProcessorEnvironment.py @@ -180,7 +180,6 @@ class ProcessorEnvironment(Processor): for region in subregions: output_dir = f"{jobPath}/plotting/{region.lower()}" - # csv_template_dir = input_dir + "/{DISEASE_DIR}/RIE_value.csv" csv_template_dir = input_dir + "/{DISEASE_DIR}/RIE_value.tif" Path(output_dir).mkdir(parents=True, exist_ok=True) diff --git a/tests/integration/partial/test_env_suit.py b/tests/integration/partial/test_env_suit.py index 0c5c44e95f76aff48a99304f4af62f18e16c098e..843556a46f285d9c7ea66d71ed99b1a94bf6be38 100644 --- a/tests/integration/partial/test_env_suit.py +++ b/tests/integration/partial/test_env_suit.py @@ -42,8 +42,8 @@ class TestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite): @staticmethod def write_temp_run_config_file(): nowstring: str = IntegrationTestUtils.get_now_string() - # prefix: str = "temp_env_" + nowstring - prefix: str = "temp_env" + prefix: str = "temp_env_" + nowstring + # prefix: str = "temp_env" default_config = IntegrationTestUtils.DEFAULT_CONFIG_FILE_PATH default_config_dict: dict = IntegrationTestUtils.load_json_file(default_config) diff --git a/tests/integration/test_suites/depo_test_suite.py b/tests/integration/test_suites/depo_test_suite.py index 15f88ea5994fbe13901254faff5e141781ceabca..2b7c8319b984094bc713baf0cc2110615f1195e3 100644 --- a/tests/integration/test_suites/depo_test_suite.py +++ b/tests/integration/test_suites/depo_test_suite.py @@ -61,10 +61,10 @@ class BaseDepoTestSuite: def test_standard_run_all_input_csvs_produced(self): east_africa_csv_path = os.path.join(IntegrationTestUtils.TEST_OUT_PATH, IntegrationTestUtils.TEST_JOB_DIR, - "plotting", "eastafrica", "input_csvs", "*.csv") + "plotting", "eastafrica", "input_csvs", "*.tif") ethiopia_csv_path = os.path.join(IntegrationTestUtils.TEST_OUT_PATH, IntegrationTestUtils.TEST_JOB_DIR, - "plotting", "ethiopia", "input_csvs", "*.csv") + "plotting", "ethiopia", "input_csvs", "*.tif") ea_csv_count: int = IntegrationTestUtils.count_files_in_wildcard(east_africa_csv_path) eth_csv_count: int = IntegrationTestUtils.count_files_in_wildcard(ethiopia_csv_path) diff --git a/tests/integration/test_suites/env_suit_test_suite.py b/tests/integration/test_suites/env_suit_test_suite.py index e21de97763de795e9a427431c2e3233cff53ec08..0030bfcab6c287e385da84cf8d1473112d232e12 100644 --- a/tests/integration/test_suites/env_suit_test_suite.py +++ b/tests/integration/test_suites/env_suit_test_suite.py @@ -62,10 +62,10 @@ class BaseEnvSuitTestSuite: def test_standard_run_all_input_csvs_produced(self): east_africa_csv_path = os.path.join(IntegrationTestUtils.TEST_OUT_PATH, IntegrationTestUtils.TEST_JOB_DIR, - "plotting", "eastafrica", "input_csvs", "*.csv") + "plotting", "eastafrica", "input_csvs", "*.tif") ethiopia_csv_path = os.path.join(IntegrationTestUtils.TEST_OUT_PATH, IntegrationTestUtils.TEST_JOB_DIR, - "plotting", "ethiopia", "input_csvs", "*.csv") + "plotting", "ethiopia", "input_csvs", "*.tif") ea_csv_count: int = IntegrationTestUtils.count_files_in_wildcard(east_africa_csv_path) eth_csv_count: int = IntegrationTestUtils.count_files_in_wildcard(ethiopia_csv_path)