From f6e04ef6edb65ad9e99b022597a3dbd5eb4a4564 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Wed, 16 Nov 2022 16:19:27 +0000
Subject: [PATCH] moving assets so they are in the same dir as other assets
---
tests/integration/test_deposition.py | 2 +-
tests/integration/test_env_suit.py | 2 +-
.../WR_EnvSuit_Met_Ethiopia_20221001_fc.tar.gz | Bin
.../assets}/WR_NAME_Ethiopia_20221001_fc.tar.gz | Bin
4 files changed, 2 insertions(+), 2 deletions(-)
rename tests/test_data/{met_office/env_suit => test_deployment/regions/EastAfrica/resources/coordinator/assets}/WR_EnvSuit_Met_Ethiopia_20221001_fc.tar.gz (100%)
rename tests/test_data/{met_office/depo => test_deployment/regions/EastAfrica/resources/coordinator/assets}/WR_NAME_Ethiopia_20221001_fc.tar.gz (100%)
diff --git a/tests/integration/test_deposition.py b/tests/integration/test_deposition.py
index f12c387..a0be65b 100644
--- a/tests/integration/test_deposition.py
+++ b/tests/integration/test_deposition.py
@@ -30,7 +30,7 @@ class TestDeposition(unittest.TestCase):
run_dict['WorkspacePathout'] = TestDeposition.TEST_OUT_PATH
run_dict['WorkspacePath'] = TestDeposition.TEST_OUT_PATH
run_dict['ServerName'] = '' # nothing, as local machine
- full_server_path = os.path.abspath("../test_data/met_office/depo/")
+ full_server_path = os.path.abspath("../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/test_env_suit.py b/tests/integration/test_env_suit.py
index 5b6e1ad..017a57f 100644
--- a/tests/integration/test_env_suit.py
+++ b/tests/integration/test_env_suit.py
@@ -33,7 +33,7 @@ class TestEnvSuit(unittest.TestCase):
run_dict['Environment']['INPUT_PATH'] = TestEnvSuit.TEST_OUT_PATH
run_dict['Environment']['OUTPUT_PATH'] = TestEnvSuit.TEST_OUT_PATH
run_dict['ServerName'] = '' # nothing, as local machine
- full_server_path = os.path.abspath("../test_data/met_office/env_suit/")
+ full_server_path = os.path.abspath("../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)
diff --git a/tests/test_data/met_office/env_suit/WR_EnvSuit_Met_Ethiopia_20221001_fc.tar.gz b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/WR_EnvSuit_Met_Ethiopia_20221001_fc.tar.gz
similarity index 100%
rename from tests/test_data/met_office/env_suit/WR_EnvSuit_Met_Ethiopia_20221001_fc.tar.gz
rename to tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/WR_EnvSuit_Met_Ethiopia_20221001_fc.tar.gz
diff --git a/tests/test_data/met_office/depo/WR_NAME_Ethiopia_20221001_fc.tar.gz b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/WR_NAME_Ethiopia_20221001_fc.tar.gz
similarity index 100%
rename from tests/test_data/met_office/depo/WR_NAME_Ethiopia_20221001_fc.tar.gz
rename to tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/assets/WR_NAME_Ethiopia_20221001_fc.tar.gz
--
GitLab