From 214f63cc5dfb307bad4e9e3a720f613e3fe4f183 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Wed, 3 May 2023 11:30:51 +0100
Subject: [PATCH] putting correct tests back in
---
tests/integration/full/full_test_advisory.py | 4 ++--
tests/integration/full/full_test_deposition.py | 2 +-
tests/integration/full/full_test_env_suit.py | 2 +-
tests/integration/full/full_test_epi.py | 4 ++--
tests/integration/full/full_test_survey.py | 2 +-
tests/integration/partial/test_advisory.py | 2 +-
tests/integration/partial/test_deposition.py | 2 +-
tests/integration/partial/test_env_suit.py | 2 +-
tests/integration/partial/test_epi.py | 2 +-
tests/integration/partial/test_survey.py | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/integration/full/full_test_advisory.py b/tests/integration/full/full_test_advisory.py
index 8df1886..668da7b 100644
--- a/tests/integration/full/full_test_advisory.py
+++ b/tests/integration/full/full_test_advisory.py
@@ -21,8 +21,8 @@ class FullTestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite):
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
# if True:
FullTestAdvisory.write_temp_run_config_files()
- # FullTestAdvisory.run_dependent_pipelines()
- # FullTestAdvisory.run_advisory_pipeline()
+ FullTestAdvisory.run_dependent_pipelines()
+ FullTestAdvisory.run_advisory_pipeline()
else:
string = f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun"
print(string)
diff --git a/tests/integration/full/full_test_deposition.py b/tests/integration/full/full_test_deposition.py
index 2135560..0402e79 100644
--- a/tests/integration/full/full_test_deposition.py
+++ b/tests/integration/full/full_test_deposition.py
@@ -23,7 +23,7 @@ class FullTestDeposition(BaseDepoTestSuite.DepoTestSuite):
if path is None \
or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
FullTestDeposition.write_temp_run_config_file()
- # FullTestDeposition.run_depo_pipeline()
+ FullTestDeposition.run_depo_pipeline()
else:
print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
diff --git a/tests/integration/full/full_test_env_suit.py b/tests/integration/full/full_test_env_suit.py
index a911f39..5ee8b8d 100644
--- a/tests/integration/full/full_test_env_suit.py
+++ b/tests/integration/full/full_test_env_suit.py
@@ -21,7 +21,7 @@ class FullTestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(
IntegrationTestUtils.TEST_OUT_PATH):
FullTestEnvSuit.write_temp_run_config_file()
- # FullTestEnvSuit.run_env_pipeline()
+ FullTestEnvSuit.run_env_pipeline()
else:
print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
diff --git a/tests/integration/full/full_test_epi.py b/tests/integration/full/full_test_epi.py
index ca877e3..1d6c03c 100644
--- a/tests/integration/full/full_test_epi.py
+++ b/tests/integration/full/full_test_epi.py
@@ -20,8 +20,8 @@ class FullTestEpi(BaseEpiTestSuite.EpiTestSuite):
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
# if True:
FullTestEpi.write_temp_run_config_files()
- # FullTestEpi.run_dependent_pipelines()
- # FullTestEpi.run_epi_pipeline()
+ FullTestEpi.run_dependent_pipelines()
+ FullTestEpi.run_epi_pipeline()
else:
print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
diff --git a/tests/integration/full/full_test_survey.py b/tests/integration/full/full_test_survey.py
index 5f9ef10..610cca5 100644
--- a/tests/integration/full/full_test_survey.py
+++ b/tests/integration/full/full_test_survey.py
@@ -20,7 +20,7 @@ class FullTestSurvey(BaseSurveyTestSuite.SurveyTestSuite):
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(
IntegrationTestUtils.TEST_OUT_PATH):
FullTestSurvey.write_temp_run_config_file()
- # FullTestSurvey.run_survey_pipeline()
+ FullTestSurvey.run_survey_pipeline()
else:
print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
diff --git a/tests/integration/partial/test_advisory.py b/tests/integration/partial/test_advisory.py
index 303c41a..9cc1dce 100644
--- a/tests/integration/partial/test_advisory.py
+++ b/tests/integration/partial/test_advisory.py
@@ -31,7 +31,7 @@ class TestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite):
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
TestAdvisory.write_temp_run_config_files()
TestAdvisory.unpack_dependencies()
- # TestAdvisory.run_advisory_pipeline()
+ TestAdvisory.run_advisory_pipeline()
else:
print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
diff --git a/tests/integration/partial/test_deposition.py b/tests/integration/partial/test_deposition.py
index 94702d4..92a6e1f 100644
--- a/tests/integration/partial/test_deposition.py
+++ b/tests/integration/partial/test_deposition.py
@@ -32,7 +32,7 @@ class TestDeposition(BaseDepoTestSuite.DepoTestSuite):
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
TestDeposition.write_temp_run_config_file()
- # TestDeposition.run_depo_pipeline()
+ TestDeposition.run_depo_pipeline()
else:
print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
diff --git a/tests/integration/partial/test_env_suit.py b/tests/integration/partial/test_env_suit.py
index f492dbd..8c33a3d 100644
--- a/tests/integration/partial/test_env_suit.py
+++ b/tests/integration/partial/test_env_suit.py
@@ -31,7 +31,7 @@ class TestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(
IntegrationTestUtils.TEST_OUT_PATH):
TestEnvSuit.write_temp_run_config_file()
- # TestEnvSuit.run_env_pipeline()
+ TestEnvSuit.run_env_pipeline()
else:
print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
diff --git a/tests/integration/partial/test_epi.py b/tests/integration/partial/test_epi.py
index 34a38cd..46ba53a 100644
--- a/tests/integration/partial/test_epi.py
+++ b/tests/integration/partial/test_epi.py
@@ -29,7 +29,7 @@ class TestEpi(BaseEpiTestSuite.EpiTestSuite):
if BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH is None or not os.path.isdir(BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH):
TestEpi.write_temp_run_config_files()
TestEpi.unpack_dependencies()
- # TestEpi.run_epi_pipeline()
+ TestEpi.run_epi_pipeline()
else:
print(f"output in {BaseEpiTestSuite.EpiTestSuite.TEST_OUT_PATH} already written, skipping rerun")
diff --git a/tests/integration/partial/test_survey.py b/tests/integration/partial/test_survey.py
index 6d1b986..59d63d5 100644
--- a/tests/integration/partial/test_survey.py
+++ b/tests/integration/partial/test_survey.py
@@ -29,7 +29,7 @@ class TestSurvey(BaseSurveyTestSuite.SurveyTestSuite):
IntegrationTestUtils.TEST_OUT_PATH):
TestSurvey.write_temp_run_config_file()
TestSurvey.unpack_dependencies()
- # TestSurvey.run_survey_pipeline()
+ TestSurvey.run_survey_pipeline()
else:
print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
--
GitLab