@@ -66,8 +66,6 @@ public static void setUp()
6666
6767 Util .cleanUpExistingDisks ("test-hyperdisk-enc-" , PROJECT_ID , ZONE );
6868 Util .cleanUpExistingStoragePool ("test-storage-pool-enc-" , PROJECT_ID , ZONE );
69- Util .cleanUpExistingDisks ("test-hyperdisk-enc-" , PROJECT_ID , "us-central1-a" );
70- Util .cleanUpExistingStoragePool ("test-storage-pool-" , PROJECT_ID , "us-central1-a" );
7169 TimeUnit .MINUTES .sleep (2 );
7270 }
7371
@@ -76,9 +74,9 @@ public static void cleanup()
7674 throws IOException , InterruptedException , ExecutionException , TimeoutException {
7775 // Delete all disks created for testing.
7876 DeleteDisk .deleteDisk (PROJECT_ID , ZONE , HYPERDISK_NAME );
79- // DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
77+ DeleteDisk .deleteDisk (PROJECT_ID , ZONE , HYPERDISK_IN_POOL_NAME );
8078
81- // Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
79+ Util .deleteStoragePool (PROJECT_ID , ZONE , STORAGE_POOL_NAME );
8280 }
8381
8482 @ Test
@@ -99,7 +97,6 @@ public void stage1_CreateHyperdiskTest()
9997 Assert .assertTrue (hyperdisk .getZone ().contains (ZONE ));
10098 }
10199
102- @ Disabled
103100 @ Test
104101 public void stage1_CreateHyperdiskStoragePoolTest ()
105102 throws IOException , ExecutionException , InterruptedException , TimeoutException {
@@ -119,7 +116,6 @@ public void stage1_CreateHyperdiskStoragePoolTest()
119116 Assert .assertTrue (storagePool .getZone ().contains (ZONE ));
120117 }
121118
122- @ Disabled
123119 @ Test
124120 public void stage2_CreateHyperdiskStoragePoolTest ()
125121 throws IOException , ExecutionException , InterruptedException , TimeoutException {
0 commit comments