diff --git a/tests/integration/full/full_test_advisory.py b/tests/integration/full/full_test_advisory.py
index 8c2c105524dd4072756703e8ceacd2fa295c714e..4fecbbb0c93b6bebf49450867f67451cf5ff479e 100644
--- a/tests/integration/full/full_test_advisory.py
+++ b/tests/integration/full/full_test_advisory.py
@@ -76,6 +76,6 @@ class FullTestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite):
if __name__ == '__main__':
- IntegrationTestUtils.run_fill_integration_test_pipeline(FullTestAdvisory,
+ IntegrationTestUtils.run_full_integration_test_pipeline(FullTestAdvisory,
test_prefix = "advisory",
processor_dir = BaseAdvisoryTestSuite.AdvisoryTestSuite.ADVISORY_PROCESSOR_DIR)
diff --git a/tests/integration/full/full_test_deposition.py b/tests/integration/full/full_test_deposition.py
index c6692a4aca3f6e08ab7999cd63b217e607b68a0e..e204d79c3ca9ff6128aef8ec54935d2a329edf43 100644
--- a/tests/integration/full/full_test_deposition.py
+++ b/tests/integration/full/full_test_deposition.py
@@ -49,6 +49,6 @@ class FullTestDeposition(BaseDepoTestSuite.DepoTestSuite):
if __name__ == '__main__':
- IntegrationTestUtils.run_fill_integration_test_pipeline(FullTestDeposition,
+ IntegrationTestUtils.run_full_integration_test_pipeline(FullTestDeposition,
test_prefix = "deposition",
processor_dir = BaseDepoTestSuite.DepoTestSuite.DEPO_PROCESSOR_DIR)
diff --git a/tests/integration/full/full_test_env_suit.py b/tests/integration/full/full_test_env_suit.py
index e94a4e81fdc2f7c07d9bd933a6253ab74a4c34b9..3017c583bbae9755b9c7b5e57c911ec7c699dbd4 100644
--- a/tests/integration/full/full_test_env_suit.py
+++ b/tests/integration/full/full_test_env_suit.py
@@ -51,6 +51,6 @@ class FullTestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
if __name__ == '__main__':
- IntegrationTestUtils.run_fill_integration_test_pipeline(FullTestEnvSuit,
+ IntegrationTestUtils.run_full_integration_test_pipeline(FullTestEnvSuit,
test_prefix = "env",
processor_dir = BaseEnvSuitTestSuite.EnvSuitTestSuite.ENV_PROCESSOR_DIR)
diff --git a/tests/integration/full/full_test_epi.py b/tests/integration/full/full_test_epi.py
index 0187148d34fee3bba21bda1367f1c7b2888c3247..c59bd25fcac761c1959deebbd5855c94751c2e6d 100644
--- a/tests/integration/full/full_test_epi.py
+++ b/tests/integration/full/full_test_epi.py
@@ -83,6 +83,6 @@ class FullTestEpi(BaseEpiTestSuite.EpiTestSuite):
if __name__ == '__main__':
- IntegrationTestUtils.run_fill_integration_test_pipeline(FullTestEpi,
+ IntegrationTestUtils.run_full_integration_test_pipeline(FullTestEpi,
test_prefix = "epi",
processor_dir = BaseEpiTestSuite.EpiTestSuite.EPI_PROCESSOR_DIR)
diff --git a/tests/integration/full/full_test_survey.py b/tests/integration/full/full_test_survey.py
index 63c1de361ee12d12fcdab981989b3c16bd1a60cd..65905fc8d49134c2563d9f063dd36db3ffd71805 100644
--- a/tests/integration/full/full_test_survey.py
+++ b/tests/integration/full/full_test_survey.py
@@ -51,7 +51,7 @@ class FullTestSurvey(BaseSurveyTestSuite.SurveyTestSuite):
if __name__ == '__main__':
- IntegrationTestUtils.run_fill_integration_test_pipeline(FullTestSurvey,
+ IntegrationTestUtils.run_full_integration_test_pipeline(FullTestSurvey,
test_prefix = "survey",
processor_dir = BaseSurveyTestSuite.SurveyTestSuite.SURVEY_PROCESSOR_DIR)
diff --git a/tests/integration/partial/integration_test_utils.py b/tests/integration/partial/integration_test_utils.py
index 566b2f029c4d8c7f7e02ba869c219a61573e7129..82474ef9328621c6127eeebfe276a7f8ce5fa1b7 100644
--- a/tests/integration/partial/integration_test_utils.py
+++ b/tests/integration/partial/integration_test_utils.py
@@ -41,7 +41,7 @@ class IntegrationTestUtils:
return parser
@staticmethod
- def run_fill_integration_test_pipeline(test_case: [TestCase],
+ def run_full_integration_test_pipeline(test_case: [TestCase],
test_prefix: str,
processor_dir: str):
diff --git a/tests/integration/partial/run_test_suite.py b/tests/integration/partial/run_test_suite.py
index e48348ab20f3564b0a0193d63cbcc52ee8191d2a..2ec30a691f0dc6bc6f7bcc48c52e3699f618e877 100644
--- a/tests/integration/partial/run_test_suite.py
+++ b/tests/integration/partial/run_test_suite.py
@@ -11,7 +11,8 @@ from integration.partial.test_advisory import TestAdvisory
def run_tests_and_report(output: str):
- tests: TestSuite = TestLoader().loadTestsFromTestCase(TestDeposition)
+ tests: TestSuite = TestSuite()
+ tests.addTests(TestLoader().loadTestsFromTestCase(TestDeposition))
tests.addTests(TestLoader().loadTestsFromTestCase(TestEnvSuit))
tests.addTests(TestLoader().loadTestsFromTestCase(TestSurvey))
tests.addTests(TestLoader().loadTestsFromTestCase(TestAdvisory))
diff --git a/tests/integration/partial/test_env_suit.py b/tests/integration/partial/test_env_suit.py
index 4548b2c91e9a1e1279cfabb6933057280528d5cb..6d658787d76f77f0d9f46e0b59b7696d06e4fda5 100644
--- a/tests/integration/partial/test_env_suit.py
+++ b/tests/integration/partial/test_env_suit.py
@@ -18,7 +18,6 @@ class TestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
self.ETH_PNG_COUNT = 6
def setUp(self) -> None:
- #test edit
self.set_expected_values()
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(
diff --git a/tests/integration/partial/test_epi.py b/tests/integration/partial/test_epi.py
index ce6223fea6654469d90be90c24758003432c709e..c9d98d496764db10b7104d30ab732de762e9ae01 100644
--- a/tests/integration/partial/test_epi.py
+++ b/tests/integration/partial/test_epi.py
@@ -9,6 +9,7 @@ from integration.test_suites.epi_test_suite import BaseEpiTestSuite
class TestEpi(BaseEpiTestSuite.EpiTestSuite):
def set_expected_values(self):
+ super().set_expected_values()
BaseEpiTestSuite.EpiTestSuite.TEST_START_DATE = '20221001'
BaseEpiTestSuite.EpiTestSuite.TEST_JOB_DIR = "EPI_" + BaseEpiTestSuite.EpiTestSuite.TEST_START_DATE
diff --git a/tests/integration/test_suites/advisory_test_suite.py b/tests/integration/test_suites/advisory_test_suite.py
index abe06ab0fca0d11942408c187bd39b23771cb30c..fe3dfeff18cc464d6f458c4879310797a470b948 100644
--- a/tests/integration/test_suites/advisory_test_suite.py
+++ b/tests/integration/test_suites/advisory_test_suite.py
@@ -19,6 +19,10 @@ class BaseAdvisoryTestSuite:
"""
ADVISORY_PROCESSOR_DIR = "ADVISORY"
+ @classmethod
+ def setUpClass(cls) -> None:
+ IntegrationTestUtils.TEST_OUT_PATH = None # reset this value for each new test class
+
@abc.abstractmethod
def set_expected_values(self):
self.EXPECTED_EA_IMAGE_COUNT = 0
diff --git a/tests/integration/test_suites/depo_test_suite.py b/tests/integration/test_suites/depo_test_suite.py
index 15f88ea5994fbe13901254faff5e141781ceabca..36938799dc42bcbd5373d455cef0dd7bc48fab09 100644
--- a/tests/integration/test_suites/depo_test_suite.py
+++ b/tests/integration/test_suites/depo_test_suite.py
@@ -19,6 +19,10 @@ class BaseDepoTestSuite:
"""
DEPO_PROCESSOR_DIR = "DEPOSITION"
+ @classmethod
+ def setUpClass(cls) -> None:
+ IntegrationTestUtils.TEST_OUT_PATH = None # reset this value for each new test class
+
@abc.abstractmethod
def set_expected_values(self):
"""
diff --git a/tests/integration/test_suites/env_suit_test_suite.py b/tests/integration/test_suites/env_suit_test_suite.py
index 54d7f2cbee9cd152d656367a1e96af329fab32d7..ebba559b5766b7ffb0ec0be666ce5846dc3e14c2 100644
--- a/tests/integration/test_suites/env_suit_test_suite.py
+++ b/tests/integration/test_suites/env_suit_test_suite.py
@@ -19,6 +19,11 @@ class BaseEnvSuitTestSuite:
"""
ENV_PROCESSOR_DIR = "ENVIRONMENT_2.0"
+ @classmethod
+ def setUpClass(cls) -> None:
+ IntegrationTestUtils.TEST_OUT_PATH = None # reset this value for each new test class
+
+
@abc.abstractmethod
def set_expected_values(self):
"""
diff --git a/tests/integration/test_suites/epi_test_suite.py b/tests/integration/test_suites/epi_test_suite.py
index c931d7a146195df49f5abe3e2250d2efe9c5cd63..0a30cd9e694c339986602762afb6790d65d0cd40 100644
--- a/tests/integration/test_suites/epi_test_suite.py
+++ b/tests/integration/test_suites/epi_test_suite.py
@@ -18,6 +18,10 @@ class BaseEpiTestSuite:
"""
EPI_PROCESSOR_DIR = "EPI"
+ @classmethod
+ def setUpClass(cls) -> None:
+ IntegrationTestUtils.TEST_OUT_PATH = None # reset this value for each new test class
+
@abc.abstractmethod
def set_expected_values(self):
pass
diff --git a/tests/integration/test_suites/survey_test_suite.py b/tests/integration/test_suites/survey_test_suite.py
index 83ef237a7212493e6867c819dac1cefcacd14a9a..ef1ad710ff5f0d4386c48d209c34d60d6813885f 100644
--- a/tests/integration/test_suites/survey_test_suite.py
+++ b/tests/integration/test_suites/survey_test_suite.py
@@ -18,6 +18,10 @@ class BaseSurveyTestSuite:
"""
SURVEY_PROCESSOR_DIR = "SURVEYDATA"
+ @classmethod
+ def setUpClass(cls) -> None:
+ IntegrationTestUtils.TEST_OUT_PATH = None # reset this value for each new test class
+
@abc.abstractmethod
def set_expected_values(self):
pass