Minor fix in ITs

Ajay Kannan · Ajay Kannan · commit bc66860a5283 · 2016-02-11T09:22:02.000-08:00
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/it/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/it/ITBigQueryTest.java
@@ -197,9 +197,11 @@ public static void afterClass() throws ExecutionException, InterruptedException
     if (bigquery != null) {
       RemoteBigQueryHelper.forceDelete(bigquery, DATASET);
     }
-    if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 10, TimeUnit.SECONDS)
-        && LOG.isLoggable(Level.WARNING)) {
-      LOG.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
+    if (storage != null) {
+      boolean wasDeleted = RemoteGcsHelper.forceDelete(storage, BUCKET, 10, TimeUnit.SECONDS);
+      if (!wasDeleted && LOG.isLoggable(Level.WARNING)) {
+        LOG.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
+      }
     }
   }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/it/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/it/ITStorageTest.java
@@ -88,9 +88,11 @@ public static void beforeClass() {
 
   @AfterClass
   public static void afterClass() throws ExecutionException, InterruptedException {
-    if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS)
-        && log.isLoggable(Level.WARNING)) {
-      log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
+    if (storage != null) {
+      boolean wasDeleted = RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS);
+      if (!wasDeleted && log.isLoggable(Level.WARNING)) {
+        log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -197,9 +197,11 @@ public static void afterClass() throws ExecutionException, InterruptedException`
`197`	`197`	`if (bigquery != null) {`
`198`	`198`	`RemoteBigQueryHelper.forceDelete(bigquery, DATASET);`
`199`	`199`	`}`
`200`		`- if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 10, TimeUnit.SECONDS)`
`201`		`- && LOG.isLoggable(Level.WARNING)) {`
`202`		`- LOG.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);`
	`200`	`+ if (storage != null) {`
	`201`	`+ boolean wasDeleted = RemoteGcsHelper.forceDelete(storage, BUCKET, 10, TimeUnit.SECONDS);`
	`202`	`+ if (!wasDeleted && LOG.isLoggable(Level.WARNING)) {`
	`203`	`+ LOG.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);`
	`204`	`+ }`
`203`	`205`	`}`
`204`	`206`	`}`
`205`	`207`
Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,11 @@ public static void beforeClass() {`
`88`	`88`
`89`	`89`	`@AfterClass`
`90`	`90`	`public static void afterClass() throws ExecutionException, InterruptedException {`
`91`		`- if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS)`
`92`		`- && log.isLoggable(Level.WARNING)) {`
`93`		`- log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);`
	`91`	`+ if (storage != null) {`
	`92`	`+ boolean wasDeleted = RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS);`
	`93`	`+ if (!wasDeleted && log.isLoggable(Level.WARNING)) {`
	`94`	`+ log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);`
	`95`	`+ }`
`94`	`96`	`}`
`95`	`97`	`}`
`96`	`98`