From 1c53e30d64d86735cf0e4f20092cc86d89f38f90 Mon Sep 17 00:00:00 2001 From: lb584 <lb584@cam.ac.uk> Date: Fri, 27 Jan 2023 14:07:19 +0000 Subject: [PATCH] repackaging integration tests --- tests/integration/partial/integration_test_utils.py | 10 +++++----- tests/integration/partial/test_deposition.py | 2 +- tests/integration/partial/test_env_suit.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/integration/partial/integration_test_utils.py b/tests/integration/partial/integration_test_utils.py index 4e383b2..67d4942 100644 --- a/tests/integration/partial/integration_test_utils.py +++ b/tests/integration/partial/integration_test_utils.py @@ -9,11 +9,11 @@ from zipfile import ZipFile class IntegrationTestUtils: EMAIL_CRED_PATH: str = "../../test_data/test_deployment/envs/Cred_gmail.json" - DEFAULT_CONFIG_FILE_PATH: str = "../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json" - TEMP_CONFIG_FILE_PATH: str = "../../test_data/test_deployment/regions/EastAfrica/workspace/temp_config.json" - EXAMPLE_SURVEY_FILE_PATH: str = "../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/example_survey_run.zip" - EXAMPLE_DEPO_FILE_PATH: str = "../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/example_depo_run.zip" - EXAMPLE_ENV_SUIT_FILE_PATH: str = "../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/example_env_suit_run.zip" + DEFAULT_CONFIG_FILE_PATH: str = "../../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json" + TEMP_CONFIG_FILE_PATH: str = "../../../test_data/test_deployment/regions/EastAfrica/workspace/temp_config.json" + EXAMPLE_SURVEY_FILE_PATH: str = "../../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/example_survey_run.zip" + EXAMPLE_DEPO_FILE_PATH: str = "../../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/example_depo_run.zip" + EXAMPLE_ENV_SUIT_FILE_PATH: str = "../../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/example_env_suit_run.zip" @staticmethod def load_json_file(file: str) -> dict: diff --git a/tests/integration/partial/test_deposition.py b/tests/integration/partial/test_deposition.py index 9652cb7..7c3fa10 100644 --- a/tests/integration/partial/test_deposition.py +++ b/tests/integration/partial/test_deposition.py @@ -31,7 +31,7 @@ class TestDeposition(unittest.TestCase): run_dict['WorkspacePath'] = TestDeposition.TEST_OUT_PATH run_dict['ServerName'] = '' # nothing, as local machine full_server_path = os.path.abspath( - "../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/") + "../../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/") run_dict['Deposition']['ServerPathTemplate'] = full_server_path IntegrationTestUtils.write_json_file(run_dict, IntegrationTestUtils.TEMP_CONFIG_FILE_PATH) diff --git a/tests/integration/partial/test_env_suit.py b/tests/integration/partial/test_env_suit.py index 05c1372..14ca2f7 100644 --- a/tests/integration/partial/test_env_suit.py +++ b/tests/integration/partial/test_env_suit.py @@ -34,7 +34,7 @@ class TestEnvSuit(unittest.TestCase): run_dict['Environment']['OUTPUT_PATH'] = TestEnvSuit.TEST_OUT_PATH run_dict['ServerName'] = '' # nothing, as local machine full_server_path = os.path.abspath( - "../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/") + "../../../test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/") run_dict['Environment']['ServerPathTemplate'] = full_server_path IntegrationTestUtils.write_json_file(run_dict, IntegrationTestUtils.TEMP_CONFIG_FILE_PATH) -- GitLab