Skip to content

Commit c6e4279

Browse files
TetyanaYahodskaTetyanaYahodska
authored
fix(compute): fixing pipeline tests failing (#9544)
* Added cleanup methods, fixed tests * added RepeatedTest annotation * Deleted whitespaces * Disabled assertion * Fixed test * Fixed test * Fixed printed line for getReservation * Commented optional parameters in CreateReservation sample, * Revert "Commented optional parameters in CreateReservation sample," This reverts commit 054f245. * revert commit * Fixed test and cleanup methods * Changed zone * Fixed test * Fixed test * Fixed test * Fixed test * Fixed Util class * Fixed styling * Deleted CrudOperationReservation * Fixed tests * Fixed tests * Fixed tests * Fixed tests * Fixed styling * Fixed deleteProtection test * Fixed deleteProtection test * Fixed Util * Uncommented optional parameters for CreateReservation * Fixed tests * changed time in Util * Fixed cleanup methods * Added cleanup method for StoragePool * Fixed HyperdiskIT * Disabled tests in HyperdiskIT * Fixed test * Changed time in Util * Fixed ReservationIT * Fixed Util class * Fixed Util class * Returned CrudOperationReservationIT class * Returned getZone() * Fixed time * Fixed Util * Added zone to clean up * Deleted zone to clean up * Fixed tests * Fixed cleanup method to cleanUpExistingRegionalInstanceTemplates * Fixed test * Added cleanup method for StoragePool, enabled tests in HyperdisksIT, fixed tests * Fixed test and naming * Cleanup resources * Fixed indentation * Fixed indentation * Fixed time to delete * Fixed time to delete, added prefix to delete stale snapshots * Changed time to delete to 45 minutes * Added Java version to reservation names * Fixed litn issue
1 parent 446856b commit c6e4279

File tree

19 files changed

+304
-244
lines changed

19 files changed

+304
-244
lines changed

‎compute/cloud-client/src/main/java/compute/reservation/CreateReservation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public static void createReservation(
107107

108108
// Wait for the create reservation operation to complete.
109109
Operation response =
110-
reservationsClient.insertAsync(projectId, zone, reservation).get(3, TimeUnit.MINUTES);
110+
reservationsClient.insertAsync(projectId, zone, reservation).get(5, TimeUnit.MINUTES);
111111

112112
if (response.hasError()) {
113113
System.out.println("Reservation creation failed!" + response);

‎compute/cloud-client/src/main/java/compute/reservation/GetReservation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static Reservation getReservation(
5050
// Get the reservation.
5151
Reservation reservation = reservationsClient.get(projectId, zone, reservationName);
5252

53-
System.out.println("Reservation: " + reservation.toString());
53+
System.out.println("Reservation: " + reservation.getName());
5454
return reservation;
5555
}
5656
}

‎compute/cloud-client/src/test/java/compute/InstanceOperationsIT.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static com.google.common.truth.Truth.assertWithMessage;
21+
import static compute.Util.getZone;
2122

2223
import com.google.cloud.compute.v1.Disk;
2324
import com.google.cloud.compute.v1.Instance;
@@ -50,7 +51,7 @@
5051
public class InstanceOperationsIT {
5152

5253
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
53-
private static final String ZONE = "us-central1-a";
54+
private static final String ZONE = getZone();
5455
private static String MACHINE_NAME;
5556
private static String MACHINE_NAME_ENCRYPTED;
5657
private static String DISK_NAME;
@@ -75,15 +76,16 @@ public static void setUp()
7576
ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
7677
System.setOut(new PrintStream(stdOut));
7778

78-
MACHINE_NAME = "my-new-test-instance" + UUID.randomUUID();
79-
MACHINE_NAME_ENCRYPTED = "encrypted-test-instance" + UUID.randomUUID();
79+
MACHINE_NAME = "test-instance-operation-" + UUID.randomUUID();
80+
MACHINE_NAME_ENCRYPTED = "test-instance-encrypted-" + UUID.randomUUID();
8081
DISK_NAME = "test-clone-disk-enc-" + UUID.randomUUID();
8182
ENCRYPTED_DISK_NAME = "test-disk-enc-" + UUID.randomUUID();
8283
RAW_KEY = Util.getBase64EncodedKey();
8384

8485
// Cleanup existing stale resources.
85-
Util.cleanUpExistingInstances("my-new-test-instance", PROJECT_ID, ZONE);
86-
Util.cleanUpExistingInstances("encrypted-test-instance", PROJECT_ID, ZONE);
86+
Util.cleanUpExistingInstances("test-instance-", PROJECT_ID, ZONE);
87+
Util.cleanUpExistingDisks("test-clone-disk-enc-", PROJECT_ID, ZONE);
88+
Util.cleanUpExistingDisks("test-disk-enc-", PROJECT_ID, ZONE);
8789

8890
compute.CreateInstance.createInstance(PROJECT_ID, ZONE, MACHINE_NAME);
8991
compute.CreateEncryptedInstance

‎compute/cloud-client/src/test/java/compute/InstancesAdvancedIT.java

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,20 @@
2727
import com.google.cloud.compute.v1.Operation;
2828
import com.google.cloud.compute.v1.Snapshot;
2929
import com.google.cloud.compute.v1.SnapshotsClient;
30-
import java.io.ByteArrayOutputStream;
3130
import java.io.IOException;
32-
import java.io.PrintStream;
3331
import java.util.List;
3432
import java.util.UUID;
3533
import java.util.concurrent.ExecutionException;
3634
import java.util.concurrent.TimeUnit;
3735
import java.util.concurrent.TimeoutException;
3836
import org.junit.Assert;
3937
import org.junit.jupiter.api.AfterAll;
40-
import org.junit.jupiter.api.AfterEach;
4138
import org.junit.jupiter.api.BeforeAll;
42-
import org.junit.jupiter.api.BeforeEach;
43-
import org.junit.jupiter.api.Disabled;
4439
import org.junit.jupiter.api.Test;
4540
import org.junit.jupiter.api.Timeout;
4641
import org.junit.runner.RunWith;
4742
import org.junit.runners.JUnit4;
4843

49-
@Disabled("TODO: fix https://github.com/GoogleCloudPlatform/java-docs-samples/issues/9373")
5044
@RunWith(JUnit4.class)
5145
@Timeout(value = 10, unit = TimeUnit.MINUTES)
5246
public class InstancesAdvancedIT {
@@ -63,10 +57,9 @@ public class InstancesAdvancedIT {
6357
private static Disk TEST_DISK;
6458
private static Image TEST_IMAGE;
6559
private static Snapshot TEST_SNAPSHOT;
66-
private static String NETWORK_NAME;
67-
private static String SUBNETWORK_NAME;
68-
69-
private ByteArrayOutputStream stdOut;
60+
private static final String NETWORK_NAME = "global/networks/default";
61+
private static final String SUBNETWORK_NAME = String.format("regions/%s/subnetworks/default",
62+
ZONE.substring(0, ZONE.length() - 2));
7063

7164
// Check if the required environment variables are set.
7265
public static void requireEnvVar(String envVarName) {
@@ -77,29 +70,24 @@ public static void requireEnvVar(String envVarName) {
7770
@BeforeAll
7871
public static void setup()
7972
throws IOException, ExecutionException, InterruptedException, TimeoutException {
80-
final PrintStream out = System.out;
81-
ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
82-
System.setOut(new PrintStream(stdOut));
8373
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
8474
requireEnvVar("GOOGLE_CLOUD_PROJECT");
8575

8676
UUID uuid = UUID.randomUUID();
87-
MACHINE_NAME_PUBLIC_IMAGE = "test-instance-pub-" + uuid;
88-
MACHINE_NAME_CUSTOM_IMAGE = "test-instance-cust-" + uuid;
89-
MACHINE_NAME_ADDITIONAL_DISK = "test-instance-add-" + uuid;
90-
MACHINE_NAME_SNAPSHOT = "test-instance-snap-" + uuid;
91-
MACHINE_NAME_SNAPSHOT_ADDITIONAL = "test-instance-snapa-" + uuid;
92-
MACHINE_NAME_SUBNETWORK = "test-instance-subnet-" + uuid;
93-
MACHINE_NAME_EXISTING_DISK = "test-instance-exis" + uuid;
94-
NETWORK_NAME = "global/networks/default";
95-
SUBNETWORK_NAME = String.format("regions/%s/subnetworks/default",
96-
ZONE.substring(0, ZONE.length() - 2));
97-
77+
MACHINE_NAME_PUBLIC_IMAGE = "test-inst-advanc-pub-" + uuid;
78+
MACHINE_NAME_CUSTOM_IMAGE = "test-inst-advanc-cust-" + uuid;
79+
MACHINE_NAME_ADDITIONAL_DISK = "test-inst-advanc-add-" + uuid;
80+
MACHINE_NAME_SNAPSHOT = "test-inst-advanc-snap-" + uuid;
81+
MACHINE_NAME_SNAPSHOT_ADDITIONAL = "test-inst-advanc-snapa-" + uuid;
82+
MACHINE_NAME_SUBNETWORK = "test-inst-advanc-subnet-" + uuid;
83+
MACHINE_NAME_EXISTING_DISK = "test-inst-advanc-exis" + uuid;
9884
TEST_DISK = createSourceDisk();
9985
TEST_SNAPSHOT = createSnapshot(TEST_DISK);
10086
TEST_IMAGE = createImage(TEST_DISK);
10187

102-
Util.cleanUpExistingInstances("test-instance", PROJECT_ID, ZONE);
88+
Util.cleanUpExistingInstances("test-inst-advanc-", PROJECT_ID, ZONE);
89+
Util.cleanUpExistingSnapshots("test-inst", PROJECT_ID);
90+
Util.cleanUpExistingDisks("test-disk-", PROJECT_ID, ZONE);
10391

10492
compute.CreateInstancesAdvanced.createFromPublicImage(PROJECT_ID, ZONE,
10593
MACHINE_NAME_PUBLIC_IMAGE);
@@ -117,16 +105,11 @@ public static void setup()
117105
MACHINE_NAME_EXISTING_DISK, List.of(TEST_DISK.getName()));
118106

119107
TimeUnit.SECONDS.sleep(60);
120-
stdOut.close();
121-
System.setOut(out);
122108
}
123109

124110
@AfterAll
125111
public static void cleanup()
126112
throws IOException, InterruptedException, ExecutionException, TimeoutException {
127-
final PrintStream out = System.out;
128-
ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
129-
System.setOut(new PrintStream(stdOut));
130113
// Delete all instances created for testing.
131114
compute.DeleteInstance.deleteInstance(PROJECT_ID, ZONE, MACHINE_NAME_PUBLIC_IMAGE);
132115
compute.DeleteInstance.deleteInstance(PROJECT_ID, ZONE, MACHINE_NAME_CUSTOM_IMAGE);
@@ -139,9 +122,6 @@ public static void cleanup()
139122
deleteImage(TEST_IMAGE);
140123
deleteSnapshot(TEST_SNAPSHOT);
141124
deleteDisk(TEST_DISK);
142-
143-
stdOut.close();
144-
System.setOut(out);
145125
}
146126

147127
private static Image getActiveDebian()
@@ -227,19 +207,6 @@ private static void deleteImage(Image image)
227207
}
228208
}
229209

230-
231-
@BeforeEach
232-
public void beforeEach() {
233-
stdOut = new ByteArrayOutputStream();
234-
System.setOut(new PrintStream(stdOut));
235-
}
236-
237-
@AfterEach
238-
public void afterEach() {
239-
stdOut = null;
240-
System.setOut(null);
241-
}
242-
243210
@Test
244211
public void testCreatePublicImage() throws IOException {
245212
// Check if the instance was successfully created during the setup.

‎compute/cloud-client/src/test/java/compute/SnippetsIT.java

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static com.google.common.truth.Truth.assertThat;
2020
import static com.google.common.truth.Truth.assertWithMessage;
2121
import static compute.Util.getEnvVar;
22+
import static compute.Util.getZone;
2223

2324
import com.google.api.gax.longrunning.OperationFuture;
2425
import com.google.cloud.compute.v1.AttachedDisk;
@@ -59,7 +60,7 @@ public class SnippetsIT {
5960

6061
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
6162
private static final String TEST_IMAGE_PROJECT_NAME = "JAVA_DOCS_COMPUTE_TEST_IMAGE_PROJECT";
62-
private static final String ZONE = "asia-south1-a";
63+
private static final String ZONE = getZone();
6364
private static final String REGION = ZONE.substring(0, ZONE.lastIndexOf('-'));
6465
private static String MACHINE_NAME;
6566
private static String MACHINE_NAME_LIST_INSTANCE;
@@ -88,21 +89,21 @@ public static void setUp()
8889
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
8990
requireEnvVar("GOOGLE_CLOUD_PROJECT");
9091

91-
MACHINE_NAME = "my-new-test-instance" + UUID.randomUUID();
92-
MACHINE_NAME_LIST_INSTANCE = "my-new-test-instance" + UUID.randomUUID();
93-
MACHINE_NAME_WAIT_FOR_OP = "my-new-test-instance" + UUID.randomUUID();
94-
MACHINE_NAME_ENCRYPTED = "encrypted-test-instance" + UUID.randomUUID();
95-
MACHINE_NAME_WITH_SSD = "test-instance-with-ssd" + UUID.randomUUID();
92+
MACHINE_NAME = "my-new-test-instance-" + UUID.randomUUID();
93+
MACHINE_NAME_LIST_INSTANCE = "my-new-test-instance-" + UUID.randomUUID();
94+
MACHINE_NAME_WAIT_FOR_OP = "my-new-test-instance-" + UUID.randomUUID();
95+
MACHINE_NAME_ENCRYPTED = "encrypted-test-instance-" + UUID.randomUUID();
96+
MACHINE_NAME_WITH_SSD = "test-instance-with-ssd-" + UUID.randomUUID();
9697
REGIONAL_LOCATION_NAME = "test-inst-temp-regional-" + UUID.randomUUID();
9798
BUCKET_NAME = "my-new-test-bucket" + UUID.randomUUID();
9899
IMAGE_PROJECT_NAME = getEnvVar(TEST_IMAGE_PROJECT_NAME, "windows-sql-cloud");
99100
RAW_KEY = Util.getBase64EncodedKey();
100101

101102
// Cleanup existing stale resources.
102-
Util.cleanUpExistingInstances("my-new-test-instance", PROJECT_ID, ZONE);
103-
Util.cleanUpExistingInstances("encrypted-test-instance", PROJECT_ID, ZONE);
104-
Util.cleanUpExistingInstances("test-instance-with-ssd", PROJECT_ID, ZONE);
105-
Util.cleanUpExistingInstanceTemplates("test-inst-temp-regional", PROJECT_ID);
103+
Util.cleanUpExistingInstances("my-new-test-instance-", PROJECT_ID, ZONE);
104+
Util.cleanUpExistingInstances("encrypted-test-instance-", PROJECT_ID, ZONE);
105+
Util.cleanUpExistingInstances("test-instance-with-ssd-", PROJECT_ID, ZONE);
106+
Util.cleanUpExistingRegionalInstanceTemplates("test-inst-temp-regional", PROJECT_ID, ZONE);
106107

107108
compute.CreateInstance.createInstance(PROJECT_ID, ZONE, MACHINE_NAME);
108109
compute.CreateInstance.createInstance(PROJECT_ID, ZONE, MACHINE_NAME_LIST_INSTANCE);
@@ -227,23 +228,24 @@ public void testSetUsageBucketExportCustomPrefix()
227228
// Set custom Report Name Prefix.
228229
String customPrefix = "my-custom-prefix";
229230
compute.SetUsageExportBucket.setUsageExportBucket(PROJECT_ID, BUCKET_NAME, customPrefix);
230-
assertThat(stdOut.toString()).doesNotContain("default value of `usage_gce`");
231-
assertThat(stdOut.toString().contains("Operation Status: DONE"));
232-
233-
// Wait for the settings to take place.
234-
TimeUnit.SECONDS.sleep(10);
231+
Assert.assertFalse(stdOut.toString().contains("default value of `usage_gce`"));
232+
Assert.assertTrue(stdOut.toString().contains("Operation Status: DONE"));
235233

236234
UsageExportLocation usageExportLocation = compute.SetUsageExportBucket
237235
.getUsageExportBucket(PROJECT_ID);
236+
237+
// Wait for the settings to take place.
238+
TimeUnit.MINUTES.sleep(3);
238239
assertThat(stdOut.toString()).doesNotContain("default value of `usage_gce`");
240+
Assert.assertNotNull(usageExportLocation.getBucketName());
239241
Assert.assertEquals(usageExportLocation.getBucketName(), BUCKET_NAME);
240242
Assert.assertEquals(usageExportLocation.getReportNamePrefix(), customPrefix);
241243

242-
// Wait for the settings to take place.
243-
TimeUnit.SECONDS.sleep(10);
244-
245244
// Disable usage exports.
246245
boolean isDisabled = compute.SetUsageExportBucket.disableUsageExportBucket(PROJECT_ID);
246+
// Wait for the settings to take place.
247+
TimeUnit.MINUTES.sleep(2);
248+
247249
Assert.assertFalse(isDisabled);
248250
}
249251

0 commit comments

Comments
 (0)