From df847d1efeb1c43f23d441c577f7531c495f0b66 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Tue, 9 Jul 2024 12:22:17 +0100
Subject: [PATCH] removing os-specific file separators from tests
---
tests/integration/partial/test_advisory.py | 4 ++--
tests/integration/partial/test_deposition.py | 2 +-
tests/integration/partial/test_env_suit.py | 2 +-
tests/integration/partial/test_epi.py | 2 +-
tests/integration/partial/test_survey.py | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/integration/partial/test_advisory.py b/tests/integration/partial/test_advisory.py
index 5ecbd33..5bf0a44 100644
--- a/tests/integration/partial/test_advisory.py
+++ b/tests/integration/partial/test_advisory.py
@@ -44,7 +44,7 @@ class TestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite):
prefix: str = "temp_advisory_" + nowstring
# prefix: str = "temp_advisory"
- IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix + os.sep
+ IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix
os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True)
sys_config_path = IntegrationTestUtils.DEFAULT_SYS_CONFIG_FILE_PATH
@@ -56,7 +56,7 @@ class TestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite):
run_config = IntegrationTestUtils.DEFAULT_ADVISORY_CONFIG_FILE_PATH
run_config_dict: dict = IntegrationTestUtils.load_json_file(run_config)
- IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix + os.sep
+ IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix
# may be reusing a non-timestamped output file during development, so allow extant TEST_OUT_PATH
os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True)
diff --git a/tests/integration/partial/test_deposition.py b/tests/integration/partial/test_deposition.py
index 23bc795..c3e3234 100644
--- a/tests/integration/partial/test_deposition.py
+++ b/tests/integration/partial/test_deposition.py
@@ -46,7 +46,7 @@ class TestDeposition(BaseDepoTestSuite.DepoTestSuite):
# prefix: str = "temp_depo"
# may be reusing a non-timestamped output file during development, so allow extant TEST_OUT_PATH
- IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix + os.sep
+ IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix
os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True)
sys_config_path = IntegrationTestUtils.DEFAULT_SYS_CONFIG_FILE_PATH
diff --git a/tests/integration/partial/test_env_suit.py b/tests/integration/partial/test_env_suit.py
index 3470776..5a62707 100644
--- a/tests/integration/partial/test_env_suit.py
+++ b/tests/integration/partial/test_env_suit.py
@@ -46,7 +46,7 @@ class TestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
# prefix: str = "temp_env"
# may be reusing a non-timestamped output file during development, so allow extant TEST_OUT_PATH
- IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix + os.sep
+ IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix
os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True)
sys_config_path = IntegrationTestUtils.DEFAULT_SYS_CONFIG_FILE_PATH
diff --git a/tests/integration/partial/test_epi.py b/tests/integration/partial/test_epi.py
index afb85d8..4356253 100644
--- a/tests/integration/partial/test_epi.py
+++ b/tests/integration/partial/test_epi.py
@@ -41,7 +41,7 @@ class TestEpi(BaseEpiTestSuite.EpiTestSuite):
prefix: str = "temp_epi_" + nowstring
# prefix: str = "temp_epi"
- IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix + os.sep
+ IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix
os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True)
sys_config_path = IntegrationTestUtils.DEFAULT_SYS_CONFIG_FILE_PATH
diff --git a/tests/integration/partial/test_survey.py b/tests/integration/partial/test_survey.py
index 3946467..8d2833b 100644
--- a/tests/integration/partial/test_survey.py
+++ b/tests/integration/partial/test_survey.py
@@ -42,7 +42,7 @@ class TestSurvey(BaseSurveyTestSuite.SurveyTestSuite):
prefix: str = "temp_survey_" + nowstring
# prefix: str = "temp_survey"
- IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix + os.sep
+ IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix
os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True)
sys_config_path = IntegrationTestUtils.DEFAULT_SYS_CONFIG_FILE_PATH
@@ -55,7 +55,7 @@ class TestSurvey(BaseSurveyTestSuite.SurveyTestSuite):
run_config = IntegrationTestUtils.DEFAULT_SURVEY_CONFIG_FILE_PATH
run_config_dict: dict = IntegrationTestUtils.load_json_file(run_config)
run_dict: dict = copy.deepcopy(run_config_dict)
- IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix + os.sep
+ IntegrationTestUtils.TEST_OUT_PATH = IntegrationTestUtils.TEST_WORKSPACE_PATH + prefix
run_dict['WORK_PATH'] = IntegrationTestUtils.TEST_OUT_PATH
run_dict['INPUT_PATH'] = IntegrationTestUtils.TEST_OUT_PATH
run_dict['OUTPUT_PATH'] = IntegrationTestUtils.TEST_OUT_PATH
--
GitLab