Skip to content

storage: speed up IT #3023

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 3 commits into from
Mar 14, 2018
Merged

storage: speed up IT #3023

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6f38e3
storage: speed up IT
pongad Mar 12, 2018
ac6a398
pr comment
pongad Mar 14, 2018
60638e2
break, not return
pongad Mar 14, 2018
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
48 changes: 24 additions & 24 deletions 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 @@ -408,47 +408,47 @@ public void testListBlobsEmptySelectedFields() throws InterruptedException {
}
}

@Test(timeout = 5000)
@Test(timeout = 7500)
public void testListBlobRequesterPays() throws InterruptedException {
String[] blobNames = {"test-list-blobs-empty-selected-fields-blob1",
"test-list-blobs-empty-selected-fields-blob2"};
BlobInfo blob1 = BlobInfo.newBuilder(BUCKET, blobNames[0])
.setContentType(CONTENT_TYPE)
.build();
BlobInfo blob2 = BlobInfo.newBuilder(BUCKET, blobNames[1])
.setContentType(CONTENT_TYPE)
.build();
Blob remoteBlob1 = storage.create(blob1);
Blob remoteBlob2 = storage.create(blob2);
assertNotNull(remoteBlob1);
assertNotNull(remoteBlob2);

Page<Blob> page = storage.list(BUCKET,
Storage.BlobListOption.prefix("test-list-blobs-empty-selected-fields-blob"),
Storage.BlobListOption.fields());
BlobInfo blob1 =
BlobInfo.newBuilder(BUCKET, "test-list-blobs-empty-selected-fields-blob1")
.setContentType(CONTENT_TYPE)
.build();
assertNotNull(storage.create(blob1));

// Test listing a Requester Pays bucket.
Bucket remoteBucket = storage.get(BUCKET, Storage.BucketGetOption.fields(BucketField.ID));
assertNull(remoteBucket.requesterPays());
remoteBucket = remoteBucket.toBuilder().setRequesterPays(true).build();
Bucket updatedBucket = storage.update(remoteBucket);
assertTrue(updatedBucket.requesterPays());
String projectId = remoteStorageHelper.getOptions().getProjectId();
try {
page = storage.list(BUCKET,
storage.list(
BUCKET,
Storage.BlobListOption.prefix("test-list-blobs-empty-selected-fields-blob"),
Storage.BlobListOption.fields(),
Storage.BlobListOption.userProject("fakeBillingProjectId"));
fail("Expected bad user project error.");
} catch (StorageException e) {
assertTrue(e.getMessage().contains("User project specified in the request is invalid"));
}
while (Iterators.size(page.iterateAll().iterator()) != 2) {

String projectId = remoteStorageHelper.getOptions().getProjectId();
while (true) {
Page<Blob> page =
storage.list(
BUCKET,
Storage.BlobListOption.prefix("test-list-blobs-empty-selected-fields-blob"),
Storage.BlobListOption.fields(),
Storage.BlobListOption.userProject(projectId));
List<Blob> blobs = Lists.newArrayList(page.iterateAll());
// If the list is empty, maybe the blob isn't visible yet; wait and try again.
// Otherwise, expect one blob, since we only put in one above.
if (!blobs.isEmpty()) {
assertThat(blobs).hasSize(1);
break;
}
Thread.sleep(500);
page = storage.list(BUCKET,
Storage.BlobListOption.prefix("test-list-blobs-empty-selected-fields-blob"),
Storage.BlobListOption.fields(),
Storage.BlobListOption.userProject(projectId));
}
}

Expand Down