From ad0902e8e8c00d723e771f68513ead6609a3866e Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Fri, 6 Jun 2025 13:33:37 +0200 Subject: [PATCH 1/2] Update ReproduceInfoPrinter to correctly print a reproduction for lucene / BC upgrade tests. Relates to ES-12005 --- .../test/junit/listeners/ReproduceInfoPrinter.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index b627a8803bf21..1ec5a61892751 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -22,6 +22,7 @@ import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunListener; +import java.util.List; import java.util.Locale; import java.util.TimeZone; @@ -67,6 +68,14 @@ public void testFailure(Failure failure) throws Exception { String task = System.getProperty("tests.task"); boolean isBwcTest = Boolean.parseBoolean(System.getProperty("tests.bwc", "false")); + for (var bwcProperty : List.of("tests.bwc.main.version", "tests.bwc.refspec.main")) { + var value = System.getProperty(bwcProperty); + if (value != null) { + isBwcTest = true; + b.append(" -D").append(bwcProperty).append("=\"").append(value).append("\" "); + } + } + // append Gradle test runner test filter string b.append("\"" + task + "\""); if (isBwcTest) { From e6b8a642102dae6f381c2f42e1d7ad950da2910c Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Tue, 10 Jun 2025 12:02:16 +0200 Subject: [PATCH 2/2] PR comments --- .../junit/listeners/ReproduceInfoPrinter.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index 1ec5a61892751..c187c9b822a86 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -22,7 +22,6 @@ import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunListener; -import java.util.List; import java.util.Locale; import java.util.TimeZone; @@ -66,15 +65,9 @@ public void testFailure(Failure failure) throws Exception { final String gradlew = Constants.WINDOWS ? "gradlew" : "./gradlew"; final StringBuilder b = new StringBuilder("REPRODUCE WITH: " + gradlew + " "); String task = System.getProperty("tests.task"); - boolean isBwcTest = Boolean.parseBoolean(System.getProperty("tests.bwc", "false")); - - for (var bwcProperty : List.of("tests.bwc.main.version", "tests.bwc.refspec.main")) { - var value = System.getProperty(bwcProperty); - if (value != null) { - isBwcTest = true; - b.append(" -D").append(bwcProperty).append("=\"").append(value).append("\" "); - } - } + boolean isBwcTest = Boolean.parseBoolean(System.getProperty("tests.bwc", "false")) + || System.getProperty("tests.bwc.main.version") != null + || System.getProperty("tests.bwc.refspec.main") != null; // append Gradle test runner test filter string b.append("\"" + task + "\""); @@ -183,7 +176,9 @@ private ReproduceErrorMessageBuilder appendESProperties() { "tests.bwc", "tests.bwc.version", "build.snapshot", - "tests.configure_test_clusters_with_one_processor" + "tests.configure_test_clusters_with_one_processor", + "tests.bwc.main.version", + "tests.bwc.refspec.main" ); if (System.getProperty("tests.jvm.argline") != null && System.getProperty("tests.jvm.argline").isEmpty() == false) { appendOpt("tests.jvm.argline", "\"" + System.getProperty("tests.jvm.argline") + "\"");