Skip to content

[Storage] Fix broken ITStorageTests #3297

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
pongad merged 1 commit into from
May 22, 2018
Merged

[Storage] Fix broken ITStorageTests #3297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 22 additions & 17 deletions ...clients/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,25 +1860,30 @@ public void testListBucketRequesterPaysFails() throws InterruptedException {
}

@Test
public void testListBucketDefaultKmsKeyName() throws InterruptedException {
Bucket remoteBucket = storage.get(BUCKET, Storage.BucketGetOption.fields(BucketField.ENCRYPTION));
assertNull(remoteBucket.getDefaultKmsKeyName());
remoteBucket = remoteBucket.toBuilder().setDefaultKmsKeyName(KMS_KEY_NAME_1).build().update();
public void testListBucketDefaultKmsKeyName() throws ExecutionException, InterruptedException {
String bucketName = RemoteStorageHelper.generateBucketName();
Bucket remoteBucket = storage.create(BucketInfo.newBuilder(bucketName)
.setDefaultKmsKeyName(KMS_KEY_NAME_1).setLocation("US").build());
assertNotNull(remoteBucket);
assertTrue(remoteBucket.getDefaultKmsKeyName().startsWith(KMS_KEY_NAME_1));
Iterator<Bucket> bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
Storage.BucketListOption.fields(BucketField.ENCRYPTION)).iterateAll().iterator();
while (!bucketIterator.hasNext()) {
Thread.sleep(500);
bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
try {
Iterator<Bucket> bucketIterator = storage.list(Storage.BucketListOption.prefix(bucketName),
Storage.BucketListOption.fields(BucketField.ENCRYPTION)).iterateAll().iterator();
}
while (bucketIterator.hasNext()) {
Bucket bucket = bucketIterator.next();
assertTrue(bucket.getName().startsWith(BUCKET));
assertNotNull(bucket.getDefaultKmsKeyName());
assertTrue(bucket.getDefaultKmsKeyName().startsWith(KMS_KEY_NAME_1));
assertNull(bucket.getCreateTime());
assertNull(bucket.getSelfLink());
while (!bucketIterator.hasNext()) {
Thread.sleep(500);
bucketIterator = storage.list(Storage.BucketListOption.prefix(bucketName),
Storage.BucketListOption.fields(BucketField.ENCRYPTION)).iterateAll().iterator();
}
while (bucketIterator.hasNext()) {
Bucket bucket = bucketIterator.next();
assertTrue(bucket.getName().startsWith(bucketName));
assertNotNull(bucket.getDefaultKmsKeyName());
assertTrue(bucket.getDefaultKmsKeyName().startsWith(KMS_KEY_NAME_1));
assertNull(bucket.getCreateTime());
assertNull(bucket.getSelfLink());
}
} finally {
RemoteStorageHelper.forceDelete(storage, bucketName, 5, TimeUnit.SECONDS);
}
}

Expand Down