Skip to content

Commit a2c6003

Browse files
Enabled HyperdiskIt tests
1 parent 5fc07af commit a2c6003

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public abstract class Util {
5757
// resources
5858
// and delete the listed resources based on the timestamp.
5959

60-
private static final int DELETION_THRESHOLD_TIME_MINUTES = 20;
60+
private static final int DELETION_THRESHOLD_TIME_MINUTES = 45;
6161
// comma separate list of zone names
6262
private static final String TEST_ZONES_NAME = "JAVA_DOCS_COMPUTE_TEST_ZONES";
6363
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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.junit.FixMethodOrder;
3333
import org.junit.jupiter.api.AfterAll;
3434
import org.junit.jupiter.api.BeforeAll;
35-
import org.junit.jupiter.api.Disabled;
3635
import org.junit.jupiter.api.Test;
3736
import org.junit.jupiter.api.Timeout;
3837
import org.junit.runner.RunWith;
@@ -66,16 +65,17 @@ public static void setUp()
6665

6766
Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
6867
Util.cleanUpExistingStoragePool("test-storage-pool-enc-", PROJECT_ID, ZONE);
68+
TimeUnit.MINUTES.sleep(2);
6969
}
7070

7171
@AfterAll
7272
public static void cleanup()
7373
throws IOException, InterruptedException, ExecutionException, TimeoutException {
7474
// Delete all disks created for testing.
7575
DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_NAME);
76-
//DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
76+
DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
7777

78-
//Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
78+
Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
7979
}
8080

8181
@Test
@@ -96,7 +96,6 @@ public void stage1_CreateHyperdiskTest()
9696
Assert.assertTrue(hyperdisk.getZone().contains(ZONE));
9797
}
9898

99-
@Disabled
10099
@Test
101100
public void stage1_CreateHyperdiskStoragePoolTest()
102101
throws IOException, ExecutionException, InterruptedException, TimeoutException {
@@ -116,7 +115,6 @@ public void stage1_CreateHyperdiskStoragePoolTest()
116115
Assert.assertTrue(storagePool.getZone().contains(ZONE));
117116
}
118117

119-
@Disabled
120118
@Test
121119
public void stage2_CreateHyperdiskStoragePoolTest()
122120
throws IOException, ExecutionException, InterruptedException, TimeoutException {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public static void setUp()
6464

6565
// Cleanup existing stale resources.
6666
Util.cleanUpExistingReservations("test-reserv" + javaVersion, PROJECT_ID, ZONE);
67+
TimeUnit.SECONDS.sleep(50);
6768

6869
CreateReservation.createReservation(
6970
PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);

0 commit comments

Comments
 (0)