Skip to content

Commit 33989e0

Browse files
Fixed test
1 parent 536cc8a commit 33989e0

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public abstract class Util {
5050
// resources
5151
// and delete the listed resources based on the timestamp.
5252

53-
private static final int DELETION_THRESHOLD_TIME_HOURS = 30;
53+
private static final int DELETION_THRESHOLD_TIME_HOURS = 1;
5454
// comma separate list of zone names
5555
private static final String TEST_ZONES_NAME = "JAVA_DOCS_COMPUTE_TEST_ZONES";
5656
private static final String DEFAULT_ZONES = "us-central1-a,us-west1-a,asia-south1-a";
@@ -119,7 +119,7 @@ && isCreatedBeforeThresholdTime(instance.getCreationTimestamp())) {
119119

120120
public static boolean isCreatedBeforeThresholdTime(String timestamp) {
121121
return OffsetDateTime.parse(timestamp).toInstant()
122-
.isBefore(Instant.now().minus(DELETION_THRESHOLD_TIME_HOURS, ChronoUnit.MINUTES));
122+
.isBefore(Instant.now().minus(DELETION_THRESHOLD_TIME_HOURS, ChronoUnit.HOURS));
123123
}
124124

125125
public static String getBase64EncodedKey() {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ public class ReservationIT {
6464
private static String GLOBAL_INSTANCE_TEMPLATE_URI;
6565
private static String REGIONAL_INSTANCE_TEMPLATE_URI;
6666
private static final String GLOBAL_INSTANCE_TEMPLATE_NAME =
67-
"test-global-inst-temp" + UUID.randomUUID();
67+
"test-global-inst-temp-" + UUID.randomUUID();
6868
private static final String REGIONAL_INSTANCE_TEMPLATE_NAME =
69-
"test-regional-inst-temp" + UUID.randomUUID();
69+
"test-regional-inst-temp-" + UUID.randomUUID();
7070
private static final String INSTANCE_NOT_CONSUME_RESERVATION_NAME =
71-
"test-instance-not-consume" + UUID.randomUUID();
71+
"test-instance-not-consume-" + UUID.randomUUID();
7272
private static final int NUMBER_OF_VMS = 3;
7373
private static final String MACHINE_TYPE = "n2-standard-32";
7474

@@ -100,9 +100,9 @@ public static void setUp()
100100
instancesClient = InstancesClient.create();
101101

102102
// Cleanup existing stale resources.
103-
Util.cleanUpExistingInstances("test-instance", PROJECT_ID, ZONE);
104-
Util.cleanUpExistingInstanceTemplates("test-global-inst-temp", PROJECT_ID);
105-
Util.cleanUpExistingRegionalInstanceTemplates("test-regional-inst-temp", PROJECT_ID, ZONE);
103+
Util.cleanUpExistingInstances("test-instance-", PROJECT_ID, ZONE);
104+
Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-", PROJECT_ID);
105+
Util.cleanUpExistingRegionalInstanceTemplates("test-regional-inst-temp-", PROJECT_ID, ZONE);
106106
Util.cleanUpExistingReservations("test-reserv-", PROJECT_ID, ZONE);
107107
TimeUnit.MINUTES.sleep(5);
108108

0 commit comments

Comments
 (0)