Skip to content

Commit 536cc8a

Browse files
Added timeout
1 parent 3ce6598 commit 536cc8a

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

compute/cloud-client/src/main/java/compute/CreateInstanceBulkInsert.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public static List<Instance> bulkInsertInstance(String project, String zone, Str
100100
.build();
101101

102102
// Wait for server update
103-
TimeUnit.SECONDS.sleep(60);;
103+
TimeUnit.SECONDS.sleep(60);
104104

105105
return Lists.newArrayList(instancesClient.list(build).iterateAll());
106106
}

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

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

6363
// Cleanup existing stale resources.
6464
Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
65+
TimeUnit.MINUTES.sleep(5);
6566

6667
CreateReservation.createReservation(
6768
PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,6 @@ public static void setUp()
8787
ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
8888
System.setOut(new PrintStream(stdOut));
8989

90-
// Cleanup existing stale resources.
91-
Util.cleanUpExistingInstances("test-instance", PROJECT_ID, ZONE);
92-
Util.cleanUpExistingInstanceTemplates("test-global-inst-temp", PROJECT_ID);
93-
Util.cleanUpExistingRegionalInstanceTemplates("test-regional-inst-temp", PROJECT_ID, ZONE);
94-
Util.cleanUpExistingReservations("test-reserv-", PROJECT_ID, ZONE);
95-
96-
// Initialize the clients once for all tests
97-
reservationsClient = ReservationsClient.create();
98-
instancesClient = InstancesClient.create();
99-
10090
RESERVATION_NAME_GLOBAL = "test-reserv-global-" + UUID.randomUUID();
10191
RESERVATION_NAME_REGIONAL = "test-reserv-regional-" + UUID.randomUUID();
10292
GLOBAL_INSTANCE_TEMPLATE_URI = String.format("projects/%s/global/instanceTemplates/%s",
@@ -105,6 +95,17 @@ public static void setUp()
10595
String.format("projects/%s/regions/%s/instanceTemplates/%s",
10696
PROJECT_ID, REGION, REGIONAL_INSTANCE_TEMPLATE_NAME);
10797

98+
// Initialize the clients once for all tests
99+
reservationsClient = ReservationsClient.create();
100+
instancesClient = InstancesClient.create();
101+
102+
// 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);
106+
Util.cleanUpExistingReservations("test-reserv-", PROJECT_ID, ZONE);
107+
TimeUnit.MINUTES.sleep(5);
108+
108109
// Create instance template with GLOBAL location.
109110
CreateInstanceTemplate.createInstanceTemplate(PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
110111
assertThat(stdOut.toString())

0 commit comments

Comments
 (0)