diff --git a/data-science-onramp/data-ingestion/ingestion_test.py b/data-science-onramp/data-ingestion/ingestion_test.py index 5f6545aaf37..f968e98bb58 100644 --- a/data-science-onramp/data-ingestion/ingestion_test.py +++ b/data-science-onramp/data-ingestion/ingestion_test.py @@ -20,7 +20,8 @@ import re import uuid -from google.api_core.exceptions import NotFound +from google.api_core import retry +from google.api_core.exceptions import InvalidArgument, NotFound from google.cloud import bigquery from google.cloud import dataproc_v1 as dataproc from google.cloud import storage @@ -154,6 +155,8 @@ def assert_table_success_message(table_name, out): ), f"Table {table_name} sucess message not printed in job logs" +# retry on InvalidArgument subnetwork not ready error +@retry.Retry(predicate=retry.if_exception_type(InvalidArgument)) def test_setup(): """Test setup.py by submitting it to a dataproc cluster Check table upload success message as well as data in the table itself""" diff --git a/data-science-onramp/data-processing/process_test.py b/data-science-onramp/data-processing/process_test.py index 6ba292c9f7a..9014d6b8243 100644 --- a/data-science-onramp/data-processing/process_test.py +++ b/data-science-onramp/data-processing/process_test.py @@ -17,7 +17,8 @@ import re import uuid -from google.api_core.exceptions import NotFound +from google.api_core import retry +from google.api_core.exceptions import InvalidArgument, NotFound from google.cloud import bigquery from google.cloud import dataproc_v1 as dataproc from google.cloud import storage @@ -160,6 +161,8 @@ def get_blob_from_path(path): return bucket.blob(output_location) +# retry on InvalidArgument subnetwork not ready error +@retry.Retry(predicate=retry.if_exception_type(InvalidArgument)) def test_process(): """Tests process.py by submitting it to a Dataproc cluster""" # Submit job to Dataproc cluster