From 5c6dd369c858b53fc058714a01a26e43ec0e8c7c Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Wed, 26 Apr 2023 18:03:16 +0100
Subject: [PATCH] reverting tests to not run via a test suite until I figure
out what is wrong
---
.gitlab-ci.yml | 6 +++++-
tests/integration/partial/run_test_suite.py | 3 ++-
tests/integration/partial/test_env_suit.py | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e01b3f..6f320ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,11 @@ half_fat_tests:
script:
- cd $CI_PROJECT_DIR/tests/integration/partial/
- - python3 -m coverage run run_test_suite.py $CI_PROJECT_DIR/test_reports
+# - python3 -m coverage run run_test_suite.py $CI_PROJECT_DIR/test_reports
+ - python3 -m coverage run -m unittest test_advisory.py
+ - python3 -m coverage run -m unittest test_deposition.py
+ - python3 -m coverage run -m unittest test_env_suit.py
+ - python3 -m coverage run -m unittest test_survey.py
- python3 -m coverage report
- python3 -m coverage html -d $CI_PROJECT_DIR/coverage
# - ls
diff --git a/tests/integration/partial/run_test_suite.py b/tests/integration/partial/run_test_suite.py
index e48348a..2ec30a6 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 3459f24..4548b2c 100644
--- a/tests/integration/partial/test_env_suit.py
+++ b/tests/integration/partial/test_env_suit.py
@@ -12,8 +12,8 @@ class TestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
IntegrationTestUtils.TEST_START_DATE = "20221001"
IntegrationTestUtils.TEST_JOB_DIR = "ENVIRONMENT_2.0_" + IntegrationTestUtils.TEST_START_DATE
- self.EA_CSV_COUNT = 18
- self.ETH_CSV_COUNT = 18
+ self.EA_CSV_COUNT = 30
+ self.ETH_CSV_COUNT = 30
self.EA_PNG_COUNT = 6
self.ETH_PNG_COUNT = 6
--
GitLab