diff --git a/samples/samples/backup_sample.py b/samples/samples/backup_sample.py index 4b2001a0e6..d22530c735 100644 --- a/samples/samples/backup_sample.py +++ b/samples/samples/backup_sample.py @@ -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: diff --git a/tests/system/conftest.py b/tests/system/conftest.py index 3a8c973f1b..7e74725189 100644 --- a/tests/system/conftest.py +++ b/tests/system/conftest.py @@ -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") diff --git a/tests/system/test_backup_api.py b/tests/system/test_backup_api.py index de521775d4..77ffca0f44 100644 --- a/tests/system/test_backup_api.py +++ b/tests/system/test_backup_api.py @@ -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