From 43eca7fb388a507335f2b5ca83adb95f505f9e7e Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Thu, 27 Oct 2022 15:30:48 +0100
Subject: [PATCH] removing redundant kena stuff
---
tests/integration/test_deposition.py | 6 +++---
tests/integration/test_env_suit.py | 4 ++--
tests/integration/test_survey.py | 4 +---
.../configs/config_EastAfrica_fc_live.json | 13 -------------
4 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/tests/integration/test_deposition.py b/tests/integration/test_deposition.py
index f64dae7..48508af 100644
--- a/tests/integration/test_deposition.py
+++ b/tests/integration/test_deposition.py
@@ -29,15 +29,15 @@ class TestDeposition(unittest.TestCase):
set_log_level(args_dict['log_level'])
run_dict: dict = copy.deepcopy(self.default_config_dict)
- test_out_path = run_dict['WorkspacePathout'] + nowstring + os.sep
+ test_out_path = run_dict['WorkspacePathout'] + "temp_depo_" + nowstring + os.sep
run_dict['WorkspacePathout'] = test_out_path
run_dict['WorkspacePath'] = test_out_path
run_dict['ServerName'] = '' # nothing, as local machine
full_server_path = os.path.abspath("../test_data/met_office/depo/")
run_dict['Deposition']['ServerPathTemplate'] = full_server_path
- run_dict['SubRegionNames'].remove('Kenya')
- run_dict['Deposition']['EWS-Plotting'].pop('Kenya', None)
+ # run_dict['SubRegionNames'].remove('Kenya')
+ # run_dict['Deposition']['EWS-Plotting'].pop('Kenya', None)
IntegrationTestUtils.write_json_file(run_dict, IntegrationTestUtils.TEMP_CONFIG_FILE_PATH)
run_Process(args_dict)
diff --git a/tests/integration/test_env_suit.py b/tests/integration/test_env_suit.py
index 3366cab..0596d6e 100644
--- a/tests/integration/test_env_suit.py
+++ b/tests/integration/test_env_suit.py
@@ -28,7 +28,7 @@ class TestEnvSuit(unittest.TestCase):
set_log_level(args_dict['log_level'])
run_dict: dict = copy.deepcopy(self.default_config_dict)
- test_out_path = run_dict['WorkspacePathout'] + nowstring + os.sep
+ test_out_path = run_dict['WorkspacePathout'] + "temp_env_" + nowstring + os.sep
run_dict['WorkspacePathout'] = test_out_path
run_dict['WorkspacePath'] = test_out_path
run_dict['Environment']['WORK_PATH'] = test_out_path
@@ -38,7 +38,7 @@ class TestEnvSuit(unittest.TestCase):
full_server_path = os.path.abspath("../test_data/met_office/env_suit/")
run_dict['Environment']['ServerPathTemplate'] = full_server_path
- run_dict['SubRegionNames'].remove('Kenya')
+ # run_dict['SubRegionNames'].remove('Kenya')
IntegrationTestUtils.write_json_file(run_dict, IntegrationTestUtils.TEMP_CONFIG_FILE_PATH)
diff --git a/tests/integration/test_survey.py b/tests/integration/test_survey.py
index 15852e1..37e80f5 100644
--- a/tests/integration/test_survey.py
+++ b/tests/integration/test_survey.py
@@ -29,14 +29,12 @@ class TestEnvSuit(unittest.TestCase):
set_log_level(args_dict['log_level'])
run_dict: dict = copy.deepcopy(self.default_config_dict)
- test_out_path = run_dict['WorkspacePathout'] + "temp_" + nowstring + os.sep
+ test_out_path = run_dict['WorkspacePathout'] + "temp_survey_" + nowstring + os.sep
run_dict['WorkspacePathout'] = test_out_path
run_dict['WorkspacePath'] = test_out_path
run_dict['Survey']['SkipServerDownload'] = True
run_dict['ServerName'] = '' # nothing, as local machine
- # run_dict['SubRegionNames'].remove('Kenya')
-
IntegrationTestUtils.write_json_file(run_dict, IntegrationTestUtils.TEMP_CONFIG_FILE_PATH)
IntegrationTestUtils.unpack_zip(IntegrationTestUtils.EXAMPLE_SURVEY_FILE_PATH, test_out_path)
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
index 72b7d01..007ef12 100644
--- a/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
@@ -120,10 +120,6 @@
"Ethiopia" : {
"ChartConfig" : "../test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_ETHIOPIA_PINE.json",
"FilterForCountry" : "True"
- },
- "Kenya" : {
- "ChartConfig" : "../test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_KENYA_PINE.json",
- "FilterForCountry" : "True"
}
}
},
@@ -147,10 +143,6 @@
"Ethiopia" : {
"ChartConfig" : "../test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_ETHIOPIA_PINE.json",
"Normalize" : "True"
- },
- "Kenya" : {
- "ChartConfig" : "../test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_KENYA_PINE.json",
- "Normalize" : "True"
}
}
},
@@ -289,11 +281,6 @@
"ShapeFilenameAdmin0" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/Eth_Region_2013.shp",
"ShapeFilenameAdmin1" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/Eth_ADM1_EN.shp",
"ShapeFilenameAdmin2" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/Eth_Woreda_2013.shp"
- },
- "Kenya" : {
- "ShapeFilenameAdmin0" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/ken_admbnda_adm0_iebc_20191031.shp",
- "ShapeFilenameAdmin1" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/ken_admbnda_adm1_iebc_20191031.shp",
- "ShapeFilenameAdmin2" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/ken_admbnda_adm2_iebc_20191031.shp"
}
},
"logos" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/logos_Ethiopia_plotting.png"
--
GitLab