From 3926b0e6c42fb8e91ee6b7fd4a2aad6f3182e5c3 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Wed, 3 May 2023 11:43:43 +0100
Subject: [PATCH] fixing half-fat epi test
---
tests/integration/partial/test_epi.py | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/integration/partial/test_epi.py b/tests/integration/partial/test_epi.py
index 46ba53a..197ce6e 100644
--- a/tests/integration/partial/test_epi.py
+++ b/tests/integration/partial/test_epi.py
@@ -18,20 +18,20 @@ class TestEpi(BaseEpiTestSuite.EpiTestSuite):
def set_expected_values(self):
super().set_expected_values()
- BaseEpiTestSuite.EpiTestSuite.TEST_START_DATE = '20221001'
- BaseEpiTestSuite.EpiTestSuite.TEST_JOB_DIR = "EPI_" + BaseEpiTestSuite.EpiTestSuite.TEST_START_DATE
+ IntegrationTestUtils.TEST_START_DATE = '20221001'
+ IntegrationTestUtils.TEST_JOB_DIR = "EPI_" + IntegrationTestUtils.TEST_START_DATE
def setUp(self) -> None:
self.set_expected_values()
- if BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH is None or not os.path.isdir(BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH):
+ if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
TestEpi.write_temp_run_config_files()
TestEpi.unpack_dependencies()
TestEpi.run_epi_pipeline()
else:
- print(f"output in {BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH} already written, skipping rerun")
+ print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
@staticmethod
@@ -43,14 +43,14 @@ class TestEpi(BaseEpiTestSuite.EpiTestSuite):
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)
- BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix + os.sep
- run_dict['WorkspacePathout'] = BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH
- run_dict['WorkspacePath'] = BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH
+ IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix + os.sep
+ run_dict['WorkspacePathout'] = IntegrationTestUtils.TEST_OUT_PATH
+ run_dict['WorkspacePath'] = IntegrationTestUtils.TEST_OUT_PATH
run_dict['ServerName'] = '' # nothing, as local machine
run_dict['Epidemiology']['CalculationSpanDays'] = [0, 1]
- os.makedirs(BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH, exist_ok = True)
- IntegrationTestUtils.TEMP_CONFIG_FILE_NAME = BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH + "temp_config.json"
+ os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True)
+ IntegrationTestUtils.TEMP_CONFIG_FILE_NAME = IntegrationTestUtils.TEST_OUT_PATH + "temp_config.json"
name = IntegrationTestUtils.TEMP_CONFIG_FILE_NAME
IntegrationTestUtils.write_json_file(run_dict, name)
@@ -58,15 +58,15 @@ class TestEpi(BaseEpiTestSuite.EpiTestSuite):
@staticmethod
def unpack_dependencies():
IntegrationTestUtils.unpack_zip(IntegrationTestUtils.EXAMPLE_DEPO_FILE_PATH,
- BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH)
+ IntegrationTestUtils.TEST_OUT_PATH)
IntegrationTestUtils.unpack_zip(IntegrationTestUtils.EXAMPLE_ENV_SUIT_FILE_PATH,
- BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH)
+ IntegrationTestUtils.TEST_OUT_PATH)
@staticmethod
def run_epi_pipeline():
component = 'Epidemiology'
- IntegrationTestUtils.run_unittest_pipeline(component, BaseEpiTestSuite.EpiTestSuite.TEST_START_DATE)
+ IntegrationTestUtils.run_unittest_pipeline(component, IntegrationTestUtils.TEST_START_DATE)
if __name__ == '__main__':
--
GitLab