Skip to content

Commit 2240989

Browse files
authored
Use extra properties for configuring test output dump on error (#103023) (#103029)
1 parent 34f887d commit 2240989

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void apply(Project project) {
5757
File testOutputDir = new File(test.getReports().getJunitXml().getOutputLocation().getAsFile().get(), "output");
5858

5959
ErrorReportingTestListener listener = new ErrorReportingTestListener(test, testOutputDir);
60-
test.getInputs().property(DUMP_OUTPUT_ON_FAILURE_PROP_NAME, true);
60+
test.getExtensions().getExtraProperties().set(DUMP_OUTPUT_ON_FAILURE_PROP_NAME, true);
6161
test.getExtensions().add("errorReportingTestListener", listener);
6262
test.addTestOutputListener(listener);
6363
test.addTestListener(listener);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/ErrorReportingTestListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ public void close() throws IOException {
258258
}
259259

260260
private boolean isDumpOutputEnabled() {
261-
return (Boolean) testTask.getInputs()
261+
return (Boolean) testTask.getExtensions()
262+
.getExtraProperties()
262263
.getProperties()
263264
.getOrDefault(ElasticsearchTestBasePlugin.DUMP_OUTPUT_ON_FAILURE_PROP_NAME, true);
264265
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public void apply(Project project) {
125125
task.setMaxParallelForks(task.getProject().getGradle().getStartParameter().getMaxWorkerCount() / 2);
126126

127127
// Disable test failure reporting since this stuff is now captured in build scans
128-
task.getInputs().property(ElasticsearchTestBasePlugin.DUMP_OUTPUT_ON_FAILURE_PROP_NAME, false);
128+
task.getExtensions().getExtraProperties().set(ElasticsearchTestBasePlugin.DUMP_OUTPUT_ON_FAILURE_PROP_NAME, false);
129129

130130
// Disable the security manager and syscall filter since the test framework needs to fork processes
131131
task.systemProperty("tests.security.manager", "false");

0 commit comments

Comments
 (0)