Skip to content

fix: Convert PBs in system test cleanup #199

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

Merged
c24t merged 9 commits into from
Dec 22, 2020
Merged

fix: Convert PBs in system test cleanup #199

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4b726a9
fix: Convert PBs in system test cleanup
c24t Dec 21, 2020
e187912
Blacken
c24t Dec 22, 2020
1c6da4b
Update DBAPI system test too
c24t Dec 22, 2020
45087bc
fix: Rename to fix "Mismatched region tag" check
c24t Dec 22, 2020
c0923e1
CI check: log span test errors
c24t Dec 22, 2020
4e135de
CI check: don't raise
c24t Dec 22, 2020
ea3d736
Revert "CI check: don't raise"
c24t Dec 22, 2020
ea43ca1
Revert "CI check: log span test errors"
c24t Dec 22, 2020
cb5f29a
Merge branch 'lowercase-test' into 195-cleanup-fix
c24t Dec 22, 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
13 changes: 9 additions & 4 deletions tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@
from google.cloud.spanner_v1 import Type

from google.cloud._helpers import UTC
from google.cloud.spanner_v1 import BurstyPool
from google.cloud.spanner_v1 import COMMIT_TIMESTAMP
from google.cloud.spanner_v1 import Client
from google.cloud.spanner_v1 import KeyRange
from google.cloud.spanner_v1 import KeySet
from google.cloud.spanner_v1 import BurstyPool
from google.cloud.spanner_v1 import COMMIT_TIMESTAMP
from google.cloud.spanner_v1.instance import Backup
from google.cloud.spanner_v1.instance import Instance

from test_utils.retry import RetryErrors
from test_utils.retry import RetryInstanceState
Expand Down Expand Up @@ -115,14 +117,17 @@ def setUpModule():

# Delete test instances that are older than an hour.
cutoff = int(time.time()) - 1 * 60 * 60
for instance in Config.CLIENT.list_instances("labels.python-spanner-systests:true"):
instance_pbs = Config.CLIENT.list_instances("labels.python-spanner-systests:true")
for instance_pb in instance_pbs:
instance = Instance.from_pb(instance_pb, Config.CLIENT)
if "created" not in instance.labels:
continue
create_time = int(instance.labels["created"])
if create_time > cutoff:
continue
# Instance cannot be deleted while backups exist.
for backup in instance.list_backups():
for backup_pb in instance.list_backups():
backup = Backup.from_pb(backup_pb, instance)
backup.delete()
instance.delete()

Expand Down