Skip to content

Commit 9472489

Browse files
authored
Upgrade randomized runner to 2.8.2 (#118242)
A recent bug we found has been fixed, so the upgrade pulls in the fix and this commit also removes the workaround we put in place.
1 parent 795cd7e commit 9472489

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ commonscodec = 1.15
3535
protobuf = 3.25.5
3636

3737
# test dependencies
38-
randomizedrunner = 2.8.0
38+
randomizedrunner = 2.8.2
3939
junit = 4.13.2
4040
junit5 = 5.7.1
4141
hamcrest = 2.1

gradle/verification-metadata.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,11 @@
184184
<sha256 value="3180617871494fe5585e93d0986fc3eb556ade2e64076730917d3a67e3928a24" origin="Generated by Gradle"/>
185185
</artifact>
186186
</component>
187+
<component group="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" version="2.8.2">
188+
<artifact name="randomizedtesting-runner-2.8.2.jar">
189+
<sha256 value="01a3551f40b56265ba117125311b4fe6865355c179f2dfc354d67f09839bc7a9" origin="Generated by Gradle"/>
190+
</artifact>
191+
</component>
187192
<component group="com.cedarsoftware" name="java-util" version="1.9.0">
188193
<artifact name="java-util-1.9.0.jar">
189194
<sha256 value="b81bdfc4ba11bbc88742ea14e8832d0a1031dd628868f5abbdabb8f8b98705dc" origin="Generated by Gradle"/>
@@ -4478,11 +4483,11 @@
44784483
<sha256 value="6e24913b021ffacfe8e7e053d6e0ccc731941148cfa078d4f1ed3d96904530f8" origin="Generated by Gradle"/>
44794484
</artifact>
44804485
</component>
4481-
<component group="org.ow2.asm" name="asm-util" version="9.7.1">
4482-
<artifact name="asm-util-9.7.1.jar">
4483-
<sha256 value="f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6" origin="Generated by Gradle"/>
4484-
</artifact>
4485-
</component>
4486+
<component group="org.ow2.asm" name="asm-util" version="9.7.1">
4487+
<artifact name="asm-util-9.7.1.jar">
4488+
<sha256 value="f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6" origin="Generated by Gradle"/>
4489+
</artifact>
4490+
</component>
44864491
<component group="org.reactivestreams" name="reactive-streams" version="1.0.4">
44874492
<artifact name="reactive-streams-1.0.4.jar">
44884493
<sha256 value="f75ca597789b3dac58f61857b9ac2e1034a68fa672db35055a8fb4509e325f28" origin="Generated by Gradle"/>

test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
package org.elasticsearch.test;
1111

12-
import com.carrotsearch.randomizedtesting.RandomizedTest;
13-
1412
import org.apache.logging.log4j.LogManager;
1513
import org.apache.logging.log4j.Logger;
1614
import org.elasticsearch.action.admin.cluster.remote.RemoteInfoRequest;
@@ -110,11 +108,6 @@ public final void startClusters() throws Exception {
110108
MockTransportService.TestPlugin.class,
111109
getTestTransportPlugin()
112110
);
113-
// We are going to initialize multiple clusters concurrently, but there is a race condition around the lazy initialization of test
114-
// groups in GroupEvaluator across multiple threads. See https://github.com/randomizedtesting/randomizedtesting/issues/311.
115-
// Calling isNightly before parallelizing is enough to work around that issue.
116-
@SuppressWarnings("unused")
117-
boolean nightly = RandomizedTest.isNightly();
118111
runInParallel(clusterAliases.size(), i -> {
119112
String clusterAlias = clusterAliases.get(i);
120113
final String clusterName = clusterAlias.equals(LOCAL_CLUSTER) ? "main-cluster" : clusterAlias;

0 commit comments

Comments
 (0)