Merge pull request #747 from mziccard/master

aozarov · aozarov · commit 646f3c9afcf9 · 2016-03-14T13:34:02.000-07:00
Fix flaky RemoteGcsHelperTest.testForceDeleteTimeout
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -132,7 +132,8 @@ public void testForceDelete() throws InterruptedException, ExecutionException {
   @Test
   public void testForceDeleteTimeout() throws InterruptedException, ExecutionException {
     Storage storageMock = EasyMock.createMock(Storage.class);
-    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(blobPage).anyTimes();
+    EasyMock.expect(storageMock.list(BUCKET_NAME, BlobListOption.versions(true)))
+        .andReturn(blobPage).anyTimes();
     for (BlobInfo info : blobList) {
       EasyMock.expect(storageMock.delete(info.blobId())).andReturn(true).anyTimes();
     }
