Skip to content
This repository was archived by the owner on Mar 31, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions samples/samples/backup_sample.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ def list_backup_operations(instance_id, database_id):

# List the CreateBackup operations.
filter_ = (
"(metadata.database:{}) AND "
"(metadata.@type:type.googleapis.com/"
"google.spanner.admin.database.v1.CreateBackupMetadata)"
"google.spanner.admin.database.v1.CreateBackupMetadata) "
"AND (metadata.database:{})"
).format(database_id)
operations = instance.list_backup_operations(filter_=filter_)
for op in operations:
Expand Down
6 changes: 5 additions & 1 deletion tests/system/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ def instance_config(instance_configs):
if not instance_configs:
raise ValueError("No instance configs found.")

yield instance_configs[0]
us_west1_config = [
config for config in instance_configs if config.display_name == "us-west1"
]
config = us_west1_config[0] if len(us_west1_config) > 0 else instance_configs[0]
yield config


@pytest.fixture(scope="session")
Expand Down
2 changes: 1 addition & 1 deletion tests/system/test_backup_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def same_config_instance(spanner_client, shared_instance, instance_operation_tim
@pytest.fixture(scope="session")
def diff_config(shared_instance, instance_configs):
current_config = shared_instance.configuration_name
for config in instance_configs:
for config in reversed(instance_configs):
if "-us-" in config.name and config.name != current_config:
return config.name
return None
Expand Down