Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(spanner): fix flaky restore_database() sample test #4641

Merged
merged 6 commits into from
Sep 18, 2020
Merged

test(spanner): fix flaky restore_database() sample test #4641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
268c4c2
test(spanner): fix flaky restore backup sample test
larkee Sep 11, 2020
f0a39f8
fix: update timeout to match other languages
larkee Sep 11, 2020
f36b3e3
test: import test_utils and set max retries to 2
larkee Sep 15, 2020
ebb3dba
test: fix import order
larkee Sep 15, 2020
709b707
test: fix import version
larkee Sep 15, 2020
8d0eb61
test: fix import order
larkee Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spanner/cloud-client/backup_sample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 3 additions & 0 deletions spanner/cloud-client/backup_sample_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
# limitations under the License.
import uuid

from google.api_core.exceptions import DeadlineExceeded
from google.cloud import spanner
import pytest
from test_utils.retry import RetryErrors

import backup_sample

Expand Down Expand Up @@ -67,6 +69,7 @@ def test_create_backup(capsys, database):
assert BACKUP_ID in out


@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()
Expand Down
1 change: 1 addition & 0 deletions spanner/cloud-client/requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
pytest==6.0.1
mock==4.0.2
google-cloud-testutils==0.1.0