Merged

test: delete backups before instance #1292

Changes from all commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6042f4b
fix: shorten the test instance name
olavloiteJul 6, 2021
c2fbf3c
test: delete backups before test instance
olavloiteJul 7, 2021
38f255b
Merge branch 'master' into delete-backups-before-instance
olavloiteJul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Failed to load files.
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import static com.google.common.truth.Truth.assertThat;

import com.google.cloud.Timestamp;
import com.google.cloud.spanner.Backup;
import com.google.cloud.spanner.BackupId;
import com.google.cloud.spanner.Database;
import com.google.cloud.spanner.DatabaseAdminClient;
Expand DownExpand Up@@ -448,6 +449,11 @@ public void testEncryptedDatabaseAndBackupSamples() throws Exception {
projectId, instanceId, encryptedDatabaseId, projectId, instanceId, encryptedRestoreId,
projectId, instanceId, encryptedBackupId, key));
} finally {
// Delete the backups from the test instance first, as the instance can only be deleted once
// all backups have been deleted.
for (Backup backup : dbClient.listBackups(instanceId).iterateAll()) {
backup.delete();
}
instanceAdminClient.deleteInstance(instanceId);
}
}
Expand Down