From 268c4c2b9a2d5cdfc117368e5a96a29909b506b6 Mon Sep 17 00:00:00 2001 From: larkee Date: Fri, 11 Sep 2020 17:39:24 +1000 Subject: [PATCH 1/6] test(spanner): fix flaky restore backup sample test --- spanner/cloud-client/backup_sample_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spanner/cloud-client/backup_sample_test.py b/spanner/cloud-client/backup_sample_test.py index 51822a9b5eb..41a7b609039 100644 --- a/spanner/cloud-client/backup_sample_test.py +++ b/spanner/cloud-client/backup_sample_test.py @@ -13,6 +13,8 @@ # limitations under the License. import uuid +from google.api_core.exceptions import DeadlineExceeded +from test_utils.retry import RetryErrors from google.cloud import spanner import pytest @@ -67,6 +69,7 @@ def test_create_backup(capsys, database): assert BACKUP_ID in out +@RetryErrors(exception=DeadlineExceeded) def test_restore_database(capsys): backup_sample.restore_database(INSTANCE_ID, RESTORE_DB_ID, BACKUP_ID) out, _ = capsys.readouterr() From f0a39f8f3efaedb69625d2b3e08b468a960d411e Mon Sep 17 00:00:00 2001 From: larkee Date: Fri, 11 Sep 2020 17:41:58 +1000 Subject: [PATCH 2/6] fix: update timeout to match other languages --- spanner/cloud-client/backup_sample.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spanner/cloud-client/backup_sample.py b/spanner/cloud-client/backup_sample.py index e19bd797f4a..e6f66c20dcd 100644 --- a/spanner/cloud-client/backup_sample.py +++ b/spanner/cloud-client/backup_sample.py @@ -68,7 +68,7 @@ def restore_database(instance_id, new_database_id, backup_id): operation = new_database.restore(backup) # Wait for restore operation to complete. - operation.result(1200) + operation.result(1600) # Newly created database has restore information. new_database.reload() From f36b3e3ca2c51d10350cb44d1e7dfecc669ea9a5 Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 15 Sep 2020 17:36:10 +1000 Subject: [PATCH 3/6] test: import test_utils and set max retries to 2 --- spanner/cloud-client/backup_sample_test.py | 2 +- spanner/cloud-client/requirements-test.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spanner/cloud-client/backup_sample_test.py b/spanner/cloud-client/backup_sample_test.py index 41a7b609039..b21435bd71e 100644 --- a/spanner/cloud-client/backup_sample_test.py +++ b/spanner/cloud-client/backup_sample_test.py @@ -69,7 +69,7 @@ def test_create_backup(capsys, database): assert BACKUP_ID in out -@RetryErrors(exception=DeadlineExceeded) +@RetryErrors(exception=DeadlineExceeded, max_tries=2) def test_restore_database(capsys): backup_sample.restore_database(INSTANCE_ID, RESTORE_DB_ID, BACKUP_ID) out, _ = capsys.readouterr() diff --git a/spanner/cloud-client/requirements-test.txt b/spanner/cloud-client/requirements-test.txt index 2466e25087c..d7c2b80f1a4 100644 --- a/spanner/cloud-client/requirements-test.txt +++ b/spanner/cloud-client/requirements-test.txt @@ -1,2 +1,3 @@ pytest==6.0.1 mock==4.0.2 +google-cloud-testutils==0.24.0 \ No newline at end of file From ebb3dba4bcc3905de99d2c7572fcdadcf2c38991 Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 15 Sep 2020 17:53:07 +1000 Subject: [PATCH 4/6] test: fix import order --- spanner/cloud-client/backup_sample_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spanner/cloud-client/backup_sample_test.py b/spanner/cloud-client/backup_sample_test.py index b21435bd71e..6ba05e4d45f 100644 --- a/spanner/cloud-client/backup_sample_test.py +++ b/spanner/cloud-client/backup_sample_test.py @@ -14,8 +14,8 @@ import uuid from google.api_core.exceptions import DeadlineExceeded -from test_utils.retry import RetryErrors from google.cloud import spanner +from test_utils.retry import RetryErrors import pytest import backup_sample From 709b707515198c3cf7d62837b1091b52475c279f Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 15 Sep 2020 17:59:55 +1000 Subject: [PATCH 5/6] test: fix import version --- spanner/cloud-client/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spanner/cloud-client/requirements-test.txt b/spanner/cloud-client/requirements-test.txt index d7c2b80f1a4..f977b64f81f 100644 --- a/spanner/cloud-client/requirements-test.txt +++ b/spanner/cloud-client/requirements-test.txt @@ -1,3 +1,3 @@ pytest==6.0.1 mock==4.0.2 -google-cloud-testutils==0.24.0 \ No newline at end of file +google-cloud-testutils==0.1.0 \ No newline at end of file From 8d0eb61db4fea107bbed31ea9c88fbfcae63a697 Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 15 Sep 2020 21:51:51 +1000 Subject: [PATCH 6/6] test: fix import order --- spanner/cloud-client/backup_sample_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spanner/cloud-client/backup_sample_test.py b/spanner/cloud-client/backup_sample_test.py index 6ba05e4d45f..c5bd028b3cb 100644 --- a/spanner/cloud-client/backup_sample_test.py +++ b/spanner/cloud-client/backup_sample_test.py @@ -15,8 +15,8 @@ from google.api_core.exceptions import DeadlineExceeded from google.cloud import spanner -from test_utils.retry import RetryErrors import pytest +from test_utils.retry import RetryErrors import backup_sample