From afa168d1b37a9aafb30263bc7707a5564b8dd8d6 Mon Sep 17 00:00:00 2001 From: lb584 <lb584@cam.ac.uk> Date: Wed, 3 May 2023 11:28:35 +0100 Subject: [PATCH] adding errors to test tests 2 --- tests/integration/full/full_test_advisory.py | 9 ++++++--- tests/integration/full/full_test_deposition.py | 3 ++- tests/integration/full/full_test_env_suit.py | 5 +++-- tests/integration/full/full_test_epi.py | 13 +++++-------- tests/integration/full/full_test_survey.py | 14 +++++--------- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/tests/integration/full/full_test_advisory.py b/tests/integration/full/full_test_advisory.py index b67bae4..8df1886 100644 --- a/tests/integration/full/full_test_advisory.py +++ b/tests/integration/full/full_test_advisory.py @@ -1,5 +1,6 @@ import copy import os +import sys from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.advisory_test_suite import BaseAdvisoryTestSuite @@ -76,6 +77,8 @@ class FullTestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite): if __name__ == '__main__': - IntegrationTestUtils.run_full_integration_test_pipeline(FullTestAdvisory, - test_prefix = "advisory", - processor_dir = BaseAdvisoryTestSuite.AdvisoryTestSuite.ADVISORY_PROCESSOR_DIR) + _success: bool = IntegrationTestUtils.run_full_integration_test_pipeline(FullTestAdvisory, + test_prefix = "advisory", + processor_dir = BaseAdvisoryTestSuite.AdvisoryTestSuite.ADVISORY_PROCESSOR_DIR) + if not _success: + sys.exit(1) diff --git a/tests/integration/full/full_test_deposition.py b/tests/integration/full/full_test_deposition.py index 0ff3c12..2135560 100644 --- a/tests/integration/full/full_test_deposition.py +++ b/tests/integration/full/full_test_deposition.py @@ -1,5 +1,6 @@ import copy import os +import sys from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.depo_test_suite import BaseDepoTestSuite @@ -54,4 +55,4 @@ if __name__ == '__main__': test_prefix = "deposition", processor_dir = BaseDepoTestSuite.DepoTestSuite.DEPO_PROCESSOR_DIR) if not _success: - exit(1) \ No newline at end of file + sys.exit(1) diff --git a/tests/integration/full/full_test_env_suit.py b/tests/integration/full/full_test_env_suit.py index 43d74fb..a911f39 100644 --- a/tests/integration/full/full_test_env_suit.py +++ b/tests/integration/full/full_test_env_suit.py @@ -1,6 +1,6 @@ import copy import os -from unittest import TextTestRunner +import sys from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.env_suit_test_suite import BaseEnvSuitTestSuite @@ -50,9 +50,10 @@ class FullTestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite): IntegrationTestUtils.TEST_START_DATE, IntegrationTestUtils.EMAIL_CRED_PATH) + if __name__ == '__main__': _success: bool = IntegrationTestUtils.run_full_integration_test_pipeline(FullTestEnvSuit, test_prefix = "env", processor_dir = BaseEnvSuitTestSuite.EnvSuitTestSuite.ENV_PROCESSOR_DIR) if not _success: - exit(1) + sys.exit(1) diff --git a/tests/integration/full/full_test_epi.py b/tests/integration/full/full_test_epi.py index 1cefe03..ca877e3 100644 --- a/tests/integration/full/full_test_epi.py +++ b/tests/integration/full/full_test_epi.py @@ -1,11 +1,6 @@ -import argparse import copy import os import sys -import unittest -from unittest import TestSuite, TestLoader - -from HtmlTestRunner import HTMLTestRunner from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.epi_test_suite import BaseEpiTestSuite @@ -83,6 +78,8 @@ class FullTestEpi(BaseEpiTestSuite.EpiTestSuite): if __name__ == '__main__': - IntegrationTestUtils.run_full_integration_test_pipeline(FullTestEpi, - test_prefix = "epi", - processor_dir = BaseEpiTestSuite.EpiTestSuite.EPI_PROCESSOR_DIR) + _success: bool = IntegrationTestUtils.run_full_integration_test_pipeline(FullTestEpi, + test_prefix = "epi", + processor_dir = BaseEpiTestSuite.EpiTestSuite.EPI_PROCESSOR_DIR) + if not _success: + sys.exit(1) diff --git a/tests/integration/full/full_test_survey.py b/tests/integration/full/full_test_survey.py index 2498f12..5f9ef10 100644 --- a/tests/integration/full/full_test_survey.py +++ b/tests/integration/full/full_test_survey.py @@ -1,11 +1,6 @@ -import argparse import copy import os import sys -import unittest -from unittest import TestSuite, TestLoader - -from HtmlTestRunner import HTMLTestRunner from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.survey_test_suite import BaseSurveyTestSuite @@ -51,7 +46,8 @@ class FullTestSurvey(BaseSurveyTestSuite.SurveyTestSuite): if __name__ == '__main__': - IntegrationTestUtils.run_full_integration_test_pipeline(FullTestSurvey, - test_prefix = "survey", - processor_dir = BaseSurveyTestSuite.SurveyTestSuite.SURVEY_PROCESSOR_DIR) - + _success: bool = IntegrationTestUtils.run_full_integration_test_pipeline(FullTestSurvey, + test_prefix = "survey", + processor_dir = BaseSurveyTestSuite.SurveyTestSuite.SURVEY_PROCESSOR_DIR) + if not _success: + sys.exit(1) -- GitLab