Skip to content
This repository was archived by the owner on Feb 24, 2026. It is now read-only.

Commit c2ec652

Browse files
committed
ci: Enable parallel tests for JUnit 5
1 parent fdd5407 commit c2ec652

5 files changed

Lines changed: 22 additions & 5 deletions

File tree

datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,15 @@
3636
import java.io.IOException;
3737
import java.io.InputStream;
3838
import java.util.zip.GZIPOutputStream;
39+
40+
import org.junit.jupiter.api.Disabled;
3941
import org.junit.jupiter.api.Test;
42+
import org.junit.jupiter.api.parallel.ResourceLock;
4043

4144
/** Test for {@link RemoteRpc}. */
4245
class RemoteRpcTest {
4346

47+
private static final String E2E_CHECKSUM_RESOURCE_LOCK = "e2eChecksum";
4448
private static final String METHOD_NAME = "methodName";
4549

4650
@Test
@@ -154,6 +158,7 @@ void testGzip() throws IOException, DatastoreException {
154158
}
155159

156160
@Test
161+
@ResourceLock(E2E_CHECKSUM_RESOURCE_LOCK)
157162
void testHttpHeaders_expectE2eChecksumHeader() throws IOException {
158163
// Enable E2E-Checksum system env variable
159164
RemoteRpc.setSystemEnvE2EChecksum(true);
@@ -177,6 +182,7 @@ void testHttpHeaders_expectE2eChecksumHeader() throws IOException {
177182
}
178183

179184
@Test
185+
@ResourceLock(E2E_CHECKSUM_RESOURCE_LOCK)
180186
void testHttpHeaders_doNotExpectE2eChecksumHeader() throws IOException {
181187
// disable E2E-Checksum system env variable
182188
RemoteRpc.setSystemEnvE2EChecksum(false);
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
junit.jupiter.execution.parallel.enabled=true
2+
junit.jupiter.execution.parallel.mode.default=concurrent
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
junit.jupiter.execution.parallel.enabled=true
2+
junit.jupiter.execution.parallel.mode.default=concurrent

google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,16 @@
2222
import com.google.cloud.datastore.DatastoreOptions;
2323
import io.opentelemetry.api.GlobalOpenTelemetry;
2424
import io.opentelemetry.sdk.OpenTelemetrySdk;
25-
import org.junit.jupiter.api.BeforeEach;
25+
import org.junit.jupiter.api.AfterEach;
2626
import org.junit.jupiter.api.Test;
27+
import org.junit.jupiter.api.parallel.Execution;
28+
import org.junit.jupiter.api.parallel.ExecutionMode;
2729

30+
@Execution(ExecutionMode.SAME_THREAD)
2831
class EnabledTraceUtilTest {
29-
@BeforeEach
30-
void setUp() {
32+
33+
@AfterEach
34+
void cleanup() {
3135
GlobalOpenTelemetry.resetForTest();
3236
}
3337

@@ -73,6 +77,7 @@ void usesGlobalOpenTelemetryIfOpenTelemetryInstanceNotProvided() {
7377
.build();
7478
EnabledTraceUtil traceUtil = new EnabledTraceUtil(datastoreOptions);
7579
assertThat(traceUtil.getOpenTelemetry()).isEqualTo(GlobalOpenTelemetry.get());
80+
ignored.close();
7681
}
7782

7883
@Test
@@ -97,15 +102,15 @@ void openTelemetryInstanceRegistersGrpcChannelConfigurator() {
97102

98103
@Test
99104
void globalOpenTelemetryRegistersGrpcChannelConfigurator() {
100-
101-
OpenTelemetrySdk.builder().buildAndRegisterGlobal();
105+
OpenTelemetrySdk ignored = OpenTelemetrySdk.builder().buildAndRegisterGlobal();
102106
DatastoreOptions datastoreOptions =
103107
getBaseOptions()
104108
.setOpenTelemetryOptions(
105109
DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build())
106110
.build();
107111
EnabledTraceUtil traceUtil = new EnabledTraceUtil(datastoreOptions);
108112
assertThat(traceUtil.getChannelConfigurator()).isNotNull();
113+
ignored.close();
109114
}
110115

111116
@Test
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
junit.jupiter.execution.parallel.enabled=true
2+
junit.jupiter.execution.parallel.mode.default=concurrent

0 commit comments

Comments
 (0)