Skip to content

Commit

Permalink
Upgrade randomized runner to 2.8.2 (elastic#118242)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
javanna authored Dec 9, 2024
1 parent 795cd7e commit 9472489
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build-tools-internal/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ commonscodec = 1.15
protobuf = 3.25.5

# test dependencies
randomizedrunner = 2.8.0
randomizedrunner = 2.8.2
junit = 4.13.2
junit5 = 5.7.1
hamcrest = 2.1
Expand Down
15 changes: 10 additions & 5 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@
<sha256 value="3180617871494fe5585e93d0986fc3eb556ade2e64076730917d3a67e3928a24" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" version="2.8.2">
<artifact name="randomizedtesting-runner-2.8.2.jar">
<sha256 value="01a3551f40b56265ba117125311b4fe6865355c179f2dfc354d67f09839bc7a9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.cedarsoftware" name="java-util" version="1.9.0">
<artifact name="java-util-1.9.0.jar">
<sha256 value="b81bdfc4ba11bbc88742ea14e8832d0a1031dd628868f5abbdabb8f8b98705dc" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -4478,11 +4483,11 @@
<sha256 value="6e24913b021ffacfe8e7e053d6e0ccc731941148cfa078d4f1ed3d96904530f8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-util" version="9.7.1">
<artifact name="asm-util-9.7.1.jar">
<sha256 value="f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-util" version="9.7.1">
<artifact name="asm-util-9.7.1.jar">
<sha256 value="f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.reactivestreams" name="reactive-streams" version="1.0.4">
<artifact name="reactive-streams-1.0.4.jar">
<sha256 value="f75ca597789b3dac58f61857b9ac2e1034a68fa672db35055a8fb4509e325f28" origin="Generated by Gradle"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

package org.elasticsearch.test;

import com.carrotsearch.randomizedtesting.RandomizedTest;

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

0 comments on commit 9472489

Please sign in to comment.