Skip to content

Commit c30e81b

Browse files
Reverted not related changes
1 parent 1900ef2 commit c30e81b

File tree

5 files changed

+0
-28
lines changed

5 files changed

+0
-28
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.google.cloud.compute.v1.Reservation;
3030
import com.google.cloud.compute.v1.ReservationsClient;
3131
import compute.DeleteInstance;
32-
import compute.Util;
3332
import java.io.IOException;
3433
import java.util.UUID;
3534
import java.util.concurrent.ExecutionException;
@@ -91,10 +90,6 @@ public static void cleanup()
9190
Assertions.assertThrows(
9291
NotFoundException.class,
9392
() -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME, ZONE));
94-
95-
// Clean up stale resources
96-
Util.cleanUpExistingInstances("test-instance-", PROJECT_ID, ZONE);
97-
Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
9893
}
9994

10095
@Test

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.cloud.compute.v1.ReservationsClient;
2727
import compute.CreateInstance;
2828
import compute.DeleteInstance;
29-
import compute.Util;
3029
import java.io.IOException;
3130
import java.util.UUID;
3231
import java.util.concurrent.ExecutionException;
@@ -80,10 +79,6 @@ public static void cleanup()
8079
// Delete resources created for testing.
8180
DeleteInstance.deleteInstance(PROJECT_ID, ZONE, instanceForReservation);
8281

83-
// Clean up stale resources
84-
Util.cleanUpExistingReservations("test-reservation-from-vm-", PROJECT_ID, ZONE);
85-
Util.cleanUpExistingInstances("test-instance-for-reserv-", PROJECT_ID, ZONE);
86-
8782
reservationsClient.close();
8883
instancesClient.close();
8984
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import com.google.api.gax.rpc.NotFoundException;
2424
import com.google.cloud.compute.v1.Reservation;
25-
import compute.Util;
2625
import java.io.IOException;
2726
import java.util.List;
2827
import java.util.UUID;
@@ -70,9 +69,6 @@ public static void cleanup()
7069
Assertions.assertThrows(
7170
NotFoundException.class,
7271
() -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME, ZONE));
73-
74-
// Clean up stale resources
75-
Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
7672
}
7773

7874
@Test

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import compute.CreateRegionalInstanceTemplate;
3737
import compute.DeleteInstanceTemplate;
3838
import compute.DeleteRegionalInstanceTemplate;
39-
import compute.Util;
4039
import java.io.ByteArrayOutputStream;
4140
import java.io.IOException;
4241
import java.io.PrintStream;
@@ -146,13 +145,6 @@ public static void cleanup()
146145
NotFoundException.class,
147146
() -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_REGIONAL, ZONE));
148147

149-
// Clean up stale resources
150-
Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
151-
Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-", PROJECT_ID);
152-
Util.cleanUpExistingInstanceTemplates("test-shared-inst-temp-", PROJECT_ID);
153-
Util.cleanUpExistingRegionalInstanceTemplates(
154-
"test-regional-inst-temp-", PROJECT_ID, ZONE);
155-
156148
stdOut.close();
157149
System.setOut(out);
158150
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.google.cloud.compute.v1.InstanceTemplate;
2424
import compute.DeleteInstance;
2525
import compute.DeleteInstanceTemplate;
26-
import compute.Util;
2726
import java.io.IOException;
2827
import java.util.UUID;
2928
import java.util.concurrent.ExecutionException;
@@ -72,11 +71,6 @@ public static void cleanup()
7271
DeleteInstance.deleteInstance(PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
7372
DeleteInstanceTemplate.deleteInstanceTemplate(
7473
PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME);
75-
76-
// Clean up stale resources
77-
Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
78-
Util.cleanUpExistingInstances("test-instance-not-consume-", PROJECT_ID, ZONE);
79-
Util.cleanUpExistingInstanceTemplates("test-template-not-consume-", PROJECT_ID);
8074
}
8175

8276
@Test

0 commit comments

Comments
 (0)