From 6400195789cee4e55a19834c43626ae6595c6fe7 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Fri, 19 Jan 2024 12:01:52 +0000
Subject: [PATCH] adding a new html test runner that works with latest python
---
.gitlab-ci.yml | 4 ++--
configs/docker/build/requirements.txt | 2 +-
tests/integration/partial/integration_test_utils.py | 4 ++--
tests/integration/partial/run_test_suite.py | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0cc682..e1a1ae7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ stages:
- ls $PACKAGES_DIR
half_fat_tests:
- when: manual
+ when: always
stage: half-fat
extends: .before_script
image: lb584/ews_coordinator_pip:gitlab
@@ -99,7 +99,7 @@ half_fat_tests:
expire_in: 10 days
half_fat_epi_tests:
- when: always
+ when: manual
stage: half-fat
extends: .before_script
image: lb584/ews_coordinator_pip:gitlab
diff --git a/configs/docker/build/requirements.txt b/configs/docker/build/requirements.txt
index dfea156..53e6342 100644
--- a/configs/docker/build/requirements.txt
+++ b/configs/docker/build/requirements.txt
@@ -4,5 +4,5 @@ python-docx==1.1.0
rioxarray==0.15.0
Rtree==1.1.0
scitools-iris==3.7.0
-html-testRunner==1.2.1
+HTMLTestRunner-rv==1.1.2
coverage==7.4.0
\ No newline at end of file
diff --git a/tests/integration/partial/integration_test_utils.py b/tests/integration/partial/integration_test_utils.py
index 2003841..24fc293 100644
--- a/tests/integration/partial/integration_test_utils.py
+++ b/tests/integration/partial/integration_test_utils.py
@@ -8,7 +8,7 @@ from typing import List, Type
from unittest import TestSuite, TestLoader, TestCase, TestResult
from zipfile import ZipFile
-from HtmlTestRunner import HTMLTestRunner
+from HTMLTestRunner import HTMLTestRunner
from Processor import Processor
from ProcessorDeposition import ProcessorDeposition
@@ -102,7 +102,7 @@ class IntegrationTestUtils:
if _test_report_dir is None:
_test_report_dir = IntegrationTestUtils.TEST_JOB_DIR
- runner = HTMLTestRunner(output = _test_report_dir, combine_reports = True)
+ runner = HTMLTestRunner(output = _test_report_dir)
result: TestResult = runner.run(tests)
return result.wasSuccessful()
diff --git a/tests/integration/partial/run_test_suite.py b/tests/integration/partial/run_test_suite.py
index 4ba4814..cde1c81 100644
--- a/tests/integration/partial/run_test_suite.py
+++ b/tests/integration/partial/run_test_suite.py
@@ -1,7 +1,7 @@
import sys
-from unittest import TestLoader, TestSuite, TestResult
+from unittest import TestLoader, TestSuite, TestResult, TextTestRunner
-from HtmlTestRunner import HTMLTestRunner
+from HTMLTestRunner import HTMLTestRunner
from integration.partial.test_advisory import TestAdvisory
from integration.partial.test_deposition import TestDeposition
@@ -21,7 +21,7 @@ def build_test_runner() -> TestSuite:
if __name__ == '__main__':
_output_dir = sys.argv.pop()
_tests = build_test_runner()
- _runner = HTMLTestRunner(output=_output_dir, combine_reports = True)
+ _runner = HTMLTestRunner(output=_output_dir)
_result: TestResult = _runner.run(_tests)
if not _result.wasSuccessful():
sys.exit(1)
--
GitLab