From 94bdc3bccffb9d905702786eefe50456f7a6efa9 Mon Sep 17 00:00:00 2001 From: lb584 <lb584@cam.ac.uk> Date: Wed, 22 Mar 2023 15:08:29 +0000 Subject: [PATCH] trying to get full-fat advisory running on server --- tests/integration/full/full_test_advisory.py | 16 +++++++++------- .../partial/integration_test_utils.py | 9 +++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/tests/integration/full/full_test_advisory.py b/tests/integration/full/full_test_advisory.py index ff669ba..b432370 100644 --- a/tests/integration/full/full_test_advisory.py +++ b/tests/integration/full/full_test_advisory.py @@ -54,14 +54,16 @@ class FullTestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite): @staticmethod def run_dependent_pipelines(): - # IntegrationTestUtils.run_external_pipeline("Deposition", - # BaseAdvisoryTestSuite.AdvisoryTestSuite.TEST_START_DATE, - # IntegrationTestUtils.EMAIL_CRED_PATH) - # IntegrationTestUtils.run_external_pipeline("Environment", - # BaseAdvisoryTestSuite.AdvisoryTestSuite.TEST_START_DATE, - # IntegrationTestUtils.EMAIL_CRED_PATH) + IntegrationTestUtils.run_external_pipeline("Deposition", + BaseAdvisoryTestSuite.AdvisoryTestSuite.TEST_START_DATE, + IntegrationTestUtils.EMAIL_CRED_PATH) + IntegrationTestUtils.run_external_pipeline("Environment", + BaseAdvisoryTestSuite.AdvisoryTestSuite.TEST_START_DATE, + IntegrationTestUtils.EMAIL_CRED_PATH) + + previous_day_string: str = IntegrationTestUtils.get_day_before_as_string(BaseAdvisoryTestSuite.AdvisoryTestSuite.TEST_START_DATE) IntegrationTestUtils.run_external_pipeline("Survey", - "20230125", + previous_day_string, IntegrationTestUtils.EMAIL_CRED_PATH) pass diff --git a/tests/integration/partial/integration_test_utils.py b/tests/integration/partial/integration_test_utils.py index c039aea..6c785a5 100644 --- a/tests/integration/partial/integration_test_utils.py +++ b/tests/integration/partial/integration_test_utils.py @@ -149,6 +149,15 @@ class IntegrationTestUtils: pass + @staticmethod + def get_day_before_as_string(input_date_string: str) -> str: + date_format = "%Y%m%d" + input_date: datetime = datetime.datetime.strptime(input_date_string, date_format) + yesterday_date = input_date - datetime.timedelta(days = 1) + yesterday_string = yesterday_date.strftime(date_format) + return yesterday_string + + @staticmethod def generate_run_date(run_date_type: str, custom_run_date: str) -> str: -- GitLab