chore: Fix broken sample tests (#2578)

sydney-munro · web-flow · commit adc14b9b43a2 · 2024-06-13T08:39:15.000-07:00
* chore: Fix broken sample tests
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java
@@ -99,7 +99,7 @@ public void run() {
                   }
                   forceDelete(storage, bucket.getName());
                 } catch (Exception e) {
-                  // Ignore the exception, maybe the bucket is being deleted by someone else.
+                  log.info("Failed to clean buckets " + e.getMessage());
                 }
               }
             }
@@ -298,6 +298,7 @@ public Boolean call() {
           }
           return true;
         } catch (StorageException e) {
+          log.warning("Caught exception in Delete Bucket Task" + e.getMessage());
           if (e.getCode() == 409) {
             try {
               Thread.sleep(500);
diff --git a/samples/snippets/src/test/java/com/example/storage/ITStorageSnippets.java b/samples/snippets/src/test/java/com/example/storage/ITStorageSnippets.java
@@ -67,12 +67,6 @@ public static void beforeClass() {
   @AfterClass
   public static void afterClass() throws ExecutionException, InterruptedException {
     if (storage != null) {
-      // In beforeClass, we make buckets auto-delete blobs older than a day old.
-      // Here, delete all buckets older than 2 days. They should already be empty and easy.
-      long cleanTime = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2);
-      long cleanTimeout = System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(1);
-      RemoteStorageHelper.cleanBuckets(storage, cleanTime, cleanTimeout);
-
       boolean wasDeleted = RemoteStorageHelper.forceDelete(storage, BUCKET, 1, TimeUnit.MINUTES);
       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
`@@ -99,7 +99,7 @@ public void run() {`
`99`	`99`	`}`
`100`	`100`	`forceDelete(storage, bucket.getName());`
`101`	`101`	`} catch (Exception e) {`
`102`		`- // Ignore the exception, maybe the bucket is being deleted by someone else.`
	`102`	`+ log.info("Failed to clean buckets " + e.getMessage());`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`
`@@ -298,6 +298,7 @@ public Boolean call() {`
`298`	`298`	`}`
`299`	`299`	`return true;`
`300`	`300`	`} catch (StorageException e) {`
	`301`	`+ log.warning("Caught exception in Delete Bucket Task" + e.getMessage());`
`301`	`302`	`if (e.getCode() == 409) {`
`302`	`303`	`try {`
`303`	`304`	`Thread.sleep(500);`