removing redundant kena stuff

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)

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)
 

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)

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"