From b0bf2975c333e7e048f3b09de7fcd33d723a9a65 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Fri, 16 Jul 2021 13:11:54 -0400 Subject: [PATCH 1/3] tests: retry 'create_instance_with_processing_units' on 429 Closes #416. --- samples/samples/snippets_test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/samples/samples/snippets_test.py b/samples/samples/snippets_test.py index 34b7641961..6393b2d26e 100644 --- a/samples/samples/snippets_test.py +++ b/samples/samples/snippets_test.py @@ -15,10 +15,12 @@ import time import uuid +from google.api_core import exceptions from google.cloud import spanner from google.cloud.spanner_v1.instance import Backup from google.cloud.spanner_v1.instance import Instance import pytest +from test_utils.retry import RetryErrors import snippets @@ -84,7 +86,10 @@ def test_create_instance(spanner_instance): def test_create_instance_with_processing_units(capsys): processing_units = 500 - snippets.create_instance_with_processing_units(LCI_INSTANCE_ID, processing_units) + retry_429 = RetryErrors(exceptions.ResourceExhausted) + retry_429(enippets.create_instance_with_processing_units)( + LCI_INSTANCE_ID, processing_units, + ) out, _ = capsys.readouterr() assert LCI_INSTANCE_ID in out assert "{} processing units".format(processing_units) in out From aaf9bc681efc5dafbb2da69a19fdb3f99b456835 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Fri, 16 Jul 2021 13:44:27 -0400 Subject: [PATCH 2/3] chore: typo --- samples/samples/snippets_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/samples/snippets_test.py b/samples/samples/snippets_test.py index 6393b2d26e..6a2d0013c6 100644 --- a/samples/samples/snippets_test.py +++ b/samples/samples/snippets_test.py @@ -87,7 +87,7 @@ def test_create_instance(spanner_instance): def test_create_instance_with_processing_units(capsys): processing_units = 500 retry_429 = RetryErrors(exceptions.ResourceExhausted) - retry_429(enippets.create_instance_with_processing_units)( + retry_429(snippets.create_instance_with_processing_units)( LCI_INSTANCE_ID, processing_units, ) out, _ = capsys.readouterr() From f5404d68c972e25c84d663666e7b7b5d4c4b0192 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 19 Jul 2021 10:39:25 -0400 Subject: [PATCH 3/3] tests: set initial retry delay for instance creation to 15 seconds Per review. --- samples/samples/snippets_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/samples/snippets_test.py b/samples/samples/snippets_test.py index 3bbb68ebe5..d6e0486f74 100644 --- a/samples/samples/snippets_test.py +++ b/samples/samples/snippets_test.py @@ -86,7 +86,7 @@ def test_create_instance(spanner_instance): def test_create_instance_with_processing_units(capsys): processing_units = 500 - retry_429 = RetryErrors(exceptions.ResourceExhausted) + retry_429 = RetryErrors(exceptions.ResourceExhausted, delay=15) retry_429(snippets.create_instance_with_processing_units)( LCI_INSTANCE_ID, processing_units, )