Fixed tests

Author: TetyanaYahodska

compute/cloud-client/src/test/java/compute/Util.java

@@ -57,7 +57,7 @@ public abstract class Util {
   // resources
   // and delete the listed resources based on the timestamp.
 
-  private static final int DELETION_THRESHOLD_TIME_MINUTES = 20;
+  private static final int DELETION_THRESHOLD_TIME_MINUTES = 25;
   // comma separate list of zone names
   private static final String TEST_ZONES_NAME = "JAVA_DOCS_COMPUTE_TEST_ZONES";
   private static final String DEFAULT_ZONES = "us-central1-a,us-west1-a,asia-south1-a";

compute/cloud-client/src/test/java/compute/disks/HyperdisksIT.java

@@ -71,13 +71,13 @@ public static void setUp()
   @AfterAll
   public static void cleanup()
        throws IOException, InterruptedException, ExecutionException, TimeoutException {
+    Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
+    Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingStoragePool("test-", PROJECT_ID, ZONE);
+
     // Delete all disks created for testing.
     DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_NAME);
     DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
-
-    Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
-    Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
-    Util.cleanUpExistingStoragePool("test-" , PROJECT_ID, ZONE);
   }
 
   @Test

compute/cloud-client/src/test/java/compute/reservation/ReservationIT.java

@@ -111,6 +111,13 @@ public static void cleanup()
     final PrintStream out = System.out;
     ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
     System.setOut(new PrintStream(stdOut));
+    // Cleanup existing stale resources.
+    Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-" + javaVersion, PROJECT_ID);
+    Util.cleanUpExistingRegionalInstanceTemplates(
+        "test-regional-inst-temp-" + javaVersion, PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations(
+        "test-reserv-global-" + javaVersion, PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations("test-reserv-regional-" + javaVersion, PROJECT_ID, ZONE);
 
     // Delete instance template with GLOBAL location.
     DeleteInstanceTemplate.deleteInstanceTemplate(PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
@@ -137,13 +144,6 @@ public static void cleanup()
         NotFoundException.class,
         () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_REGIONAL, ZONE));
 
-    // Cleanup existing stale resources.
-    Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-" + javaVersion, PROJECT_ID);
-    Util.cleanUpExistingRegionalInstanceTemplates(
-        "test-regional-inst-temp-" + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations(
-        "test-reserv-global-" + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations("test-reserv-regional-" + javaVersion, PROJECT_ID, ZONE);
 
     // Close the client after all tests
     reservationsClient.close();