From df9ce67ed3d7a830e860eb685db5cc82f5fceefa Mon Sep 17 00:00:00 2001 From: Luca Cinquini Date: Tue, 2 Jan 2024 08:27:35 -0700 Subject: [PATCH 1/3] Reducing verbosity for test_get_processing_status.py --- unity-test/step_defs/conftest.py | 2 ++ unity-test/step_defs/test_get_processing_status.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/unity-test/step_defs/conftest.py b/unity-test/step_defs/conftest.py index ccc79ad..2537326 100644 --- a/unity-test/step_defs/conftest.py +++ b/unity-test/step_defs/conftest.py @@ -6,10 +6,12 @@ import re from . import TEST_BASE_DIR from .utils import JsonReader +import logging FEATURES_DIR = TEST_BASE_DIR.joinpath("features") reader = JsonReader() +logging.getLogger('backoff').setLevel(logging.ERROR) def pytest_addoption(parser): diff --git a/unity-test/step_defs/test_get_processing_status.py b/unity-test/step_defs/test_get_processing_status.py index f9fc083..e33fbf3 100644 --- a/unity-test/step_defs/test_get_processing_status.py +++ b/unity-test/step_defs/test_get_processing_status.py @@ -28,9 +28,9 @@ def created_response(response): @backoff.on_exception( backoff.constant, (requests.exceptions.HTTPError), - max_time=3600, + max_time=60, jitter=None, - interval=1, + interval=10, ) def request_job_status_by_id(process_service_endpoint, project_process_dict, job_id): return _request_job_status_by_id( From 4647a3ec626fdd64d6402ef4c303ebd5586cc101 Mon Sep 17 00:00:00 2001 From: Luca Cinquini Date: Tue, 2 Jan 2024 12:55:47 -0700 Subject: [PATCH 2/3] Setting logger=None for backoff decorator --- unity-test/step_defs/conftest.py | 3 --- unity-test/step_defs/test_get_processing_status.py | 1 + unity-test/step_defs/test_job_database_status.py | 6 ++++-- unity-test/step_defs/test_successful_execution.py | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/unity-test/step_defs/conftest.py b/unity-test/step_defs/conftest.py index 2537326..d9c29a1 100644 --- a/unity-test/step_defs/conftest.py +++ b/unity-test/step_defs/conftest.py @@ -6,12 +6,9 @@ import re from . import TEST_BASE_DIR from .utils import JsonReader -import logging - FEATURES_DIR = TEST_BASE_DIR.joinpath("features") reader = JsonReader() -logging.getLogger('backoff').setLevel(logging.ERROR) def pytest_addoption(parser): diff --git a/unity-test/step_defs/test_get_processing_status.py b/unity-test/step_defs/test_get_processing_status.py index e33fbf3..5ef807f 100644 --- a/unity-test/step_defs/test_get_processing_status.py +++ b/unity-test/step_defs/test_get_processing_status.py @@ -30,6 +30,7 @@ def created_response(response): (requests.exceptions.HTTPError), max_time=60, jitter=None, + logger=None, interval=10, ) def request_job_status_by_id(process_service_endpoint, project_process_dict, job_id): diff --git a/unity-test/step_defs/test_job_database_status.py b/unity-test/step_defs/test_job_database_status.py index 31e025a..b7d0472 100644 --- a/unity-test/step_defs/test_job_database_status.py +++ b/unity-test/step_defs/test_job_database_status.py @@ -48,7 +48,8 @@ def fatal_status(e): max_time=3600, giveup=fatal_status, jitter=None, - interval=0.1, # check more frequently since jobs can execute quickly + logger=None, + interval=1, # check more frequently since jobs can execute quickly ) def request_job_status_by_id_running(process_service_endpoint, project_process_dict, job_id): job_status_response = _request_job_status_by_id( @@ -69,9 +70,10 @@ def request_job_status_by_id_running(process_service_endpoint, project_process_d @backoff.on_exception( backoff.constant, (AssertionError, requests.exceptions.HTTPError), - max_time=3600, + max_time=60, giveup=fatal_status, jitter=None, + logger=None, interval=1, ) def request_job_status_by_id_succeeded(process_service_endpoint, project_process_dict, job_id): diff --git a/unity-test/step_defs/test_successful_execution.py b/unity-test/step_defs/test_successful_execution.py index c718ba9..aa161b5 100644 --- a/unity-test/step_defs/test_successful_execution.py +++ b/unity-test/step_defs/test_successful_execution.py @@ -38,7 +38,8 @@ def fatal_status(e): max_time=3600, giveup=fatal_status, jitter=None, - interval=1, + logger=None, + interval=5, ) def request_job_status_by_id(process_service_endpoint, project_process_dict, job_id): job_status_response = _request_job_status_by_id( From e19eeeb3d3a522d6abd2070b0bbebe06484e184d Mon Sep 17 00:00:00 2001 From: Luca Cinquini Date: Fri, 5 Jan 2024 11:30:44 -0700 Subject: [PATCH 3/3] Update test_get_processing_status.py Increase the test execution to 1 hour --- unity-test/step_defs/test_get_processing_status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unity-test/step_defs/test_get_processing_status.py b/unity-test/step_defs/test_get_processing_status.py index 5ef807f..de5e5ee 100644 --- a/unity-test/step_defs/test_get_processing_status.py +++ b/unity-test/step_defs/test_get_processing_status.py @@ -28,7 +28,7 @@ def created_response(response): @backoff.on_exception( backoff.constant, (requests.exceptions.HTTPError), - max_time=60, + max_time=3600, jitter=None, logger=None, interval=10,