---

pongad · pongad · commit b2d0f7dc88d9 · 2018-03-14T11:27:45.000+11:00
yaml --- r: 9233 b: refs/heads/spanner-gapic-migration c: ac6a398 h: refs/heads/master i: 9231: 89b7c3c
diff --git a/[refs] b/[refs]
@@ -81,7 +81,7 @@ refs/tags/v0.35.0: c28951c5f4cc97a1be07900d19df6984115a4bd6
 refs/tags/v0.36.0: 6b75c61f73e6827b3ca379bd54f88f750290162f
 refs/tags/v0.37.0: db2e142f92601709fdd48db159776f905742e30f
 refs/heads/mrschmidt-sizefix: 627a3bfa30bb6f4f76af47b228c38b208dd921e0
-refs/heads/spanner-gapic-migration: c6f38e3592498d6d6184b838bf245bfa133ede04
+refs/heads/spanner-gapic-migration: ac6a39888e57f48446c4e703afbfa5e10666c0e6
 refs/tags/v0.38.0: c235ee4df5e1248e1769dae3f86a0d7ab7fd8301
 refs/tags/v0.39.0: ab231c9d22475242a43d6d9554aa4a3f736dab01
 refs/tags/v0.40.0: a1d5b05206cce7734365f1b910396a2c9d6605ec
diff --git a/branches/spanner-gapic-migration/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/branches/spanner-gapic-migration/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
@@ -408,7 +408,7 @@ public void testListBlobsEmptySelectedFields() throws InterruptedException {
     }
   }
 
-  @Test(timeout = 5000)
+  @Test(timeout = 7500)
   public void testListBlobRequesterPays() throws InterruptedException {
     BlobInfo blob1 =
         BlobInfo.newBuilder(BUCKET, "test-list-blobs-empty-selected-fields-blob1")
@@ -434,16 +434,19 @@ public void testListBlobRequesterPays() throws InterruptedException {
     }
 
     String projectId = remoteStorageHelper.getOptions().getProjectId();
-    for (; ; ) {
+    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));
-      int size = Iterators.size(page.iterateAll().iterator());
-      if (size == 1) {
-        break;
+      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);
+        return;
       }
       Thread.sleep(500);
     }
