From 321e0edde98a9505e92641ebf0485d6c360b2464 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Wed, 7 Dec 2022 11:32:56 +0000
Subject: [PATCH] removing duplicate test call and reordering

---
 .gitlab-ci.yml                 |  5 ++---
 tests/integration/sub_test.py  | 23 -----------------------
 tests/integration/test_test.py |  8 --------
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 tests/integration/sub_test.py
 delete mode 100644 tests/integration/test_test.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a106c6e..358bf18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,11 @@ test:
     - python -m coverage report
     - python -m coverage html -d $CI_PROJECT_DIR/coverage
     - cd $CI_PROJECT_DIR/tests/integration
-    - python3 -m coverage run -m unittest test_deposition.py
+    - 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 run -m unittest test_advisory.py
     - python3 -m coverage run -m unittest test_epi.py
+    - python3 -m coverage run -m unittest test_survey.py
     - python -m coverage report
     - python -m coverage html -d $CI_PROJECT_DIR/coverage
     - ls
diff --git a/tests/integration/sub_test.py b/tests/integration/sub_test.py
deleted file mode 100644
index 5dfdd4a..0000000
--- a/tests/integration/sub_test.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import unittest
-
-from integration.test_test import MyTestCase
-
-
-class SubTest(unittest.TestCase):
-
-    def __init__(self, methodName: str = ...) -> None:
-        super().__init__(methodName)
-        print("RUNNING SETUP")
-
-    def test_1(self):
-        self.assertEqual(True, True)  # add assertion here
-
-    def test_2(self):
-        self.assertEqual(True, True)  # add assertion here
-
-    def test_3(self):
-        self.assertEqual(True, True)  # add assertion here
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/integration/test_test.py b/tests/integration/test_test.py
deleted file mode 100644
index 286267b..0000000
--- a/tests/integration/test_test.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import unittest
-
-
-class MyTestCase(unittest.TestCase):
-
-    def setUp(self) -> None:
-        print("running setup")
-
-- 
GitLab