From 215c463c9c5cf02efccb36ef92f71714d5aabc75 Mon Sep 17 00:00:00 2001 From: Sam Laane Date: Fri, 28 Aug 2020 13:21:26 -0700 Subject: [PATCH 1/3] Update TI cleanup code to clean up target project. The cleanup code currently tries to cleanup a hardcoded project regardless of the project used by the user running the test. --- src/test/java/com/google/cloud/compute/v1/it/BaseTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/google/cloud/compute/v1/it/BaseTest.java b/src/test/java/com/google/cloud/compute/v1/it/BaseTest.java index ad43a2f21..be0866f0e 100644 --- a/src/test/java/com/google/cloud/compute/v1/it/BaseTest.java +++ b/src/test/java/com/google/cloud/compute/v1/it/BaseTest.java @@ -149,7 +149,7 @@ static void cleanUpNetworks() throws IOException { // clean up old networks List networks = - Lists.newArrayList(networkClient.listNetworks("gcloud-devel").iterateAll()); + Lists.newArrayList(networkClient.listNetworks(DEFAULT_PROJECT).iterateAll()); for (Network network : networks) { if (network.getName().startsWith("test-")) { Timestamp createdAt = Timestamp.parseTimestamp(network.getCreationTimestamp()); From 9d806c308762efd5c2a0fddaccbeb8ce9fb8d0e9 Mon Sep 17 00:00:00 2001 From: Sam Laane Date: Fri, 28 Aug 2020 17:27:31 -0700 Subject: [PATCH 2/3] Deflake compute test by waiting for LORs. Cleanup can currently fail when it tries to remove the TargetPool while the LOR for setting up the backup is still running. https://screenshot.googleplex.com/5XdSmb3nBZGLd7N --- .../java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java b/src/test/java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java index 8a2a18a9f..82cca9fdf 100644 --- a/src/test/java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java +++ b/src/test/java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java @@ -133,6 +133,7 @@ public void setBackupTargetPoolTest() throws Exception { assertThat(response.getStatus()).isEqualTo("RUNNING"); assertThat(response.getRegion()).isEqualTo(REGION_LINK); assertThat(response.getTargetLink()).isEqualTo(TARGET_POOL_SELF_LINK); + waitForOperation(response); } @Test @@ -162,6 +163,7 @@ public void addHealthCheckTargetPoolTest() { Operation response = targetPoolClient.addHealthCheckTargetPool( REGION_TARGET_POOL_NAME, targetPoolsAddHealthCheckRequestResource); + response = waitForOperation(response) assertThat(response).isNotNull(); assertThat(response.getOperationType()).isEqualTo("AddHealthCheck"); assertThat(response.getStatus()).isEqualTo("DONE"); From f96685c9ca1da468a2ef3cea4821be405064a8c3 Mon Sep 17 00:00:00 2001 From: Sam Laane Date: Sat, 29 Aug 2020 22:37:03 -0700 Subject: [PATCH 3/3] Add missing; --- .../java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java b/src/test/java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java index 82cca9fdf..1ac69c30c 100644 --- a/src/test/java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java +++ b/src/test/java/com/google/cloud/compute/v1/it/ITTargetPoolTest.java @@ -163,7 +163,7 @@ public void addHealthCheckTargetPoolTest() { Operation response = targetPoolClient.addHealthCheckTargetPool( REGION_TARGET_POOL_NAME, targetPoolsAddHealthCheckRequestResource); - response = waitForOperation(response) + response = waitForOperation(response); assertThat(response).isNotNull(); assertThat(response.getOperationType()).isEqualTo("AddHealthCheck"); assertThat(response.getStatus()).isEqualTo("DONE");