diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/scriptler/ScriptResult.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/scriptler/ScriptResult.java index 02c6b2ca1..0876d7e90 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/plugins/scriptler/ScriptResult.java +++ b/src/main/java/org/jenkinsci/test/acceptance/plugins/scriptler/ScriptResult.java @@ -23,15 +23,12 @@ */ package org.jenkinsci.test.acceptance.plugins.scriptler; -import java.util.List; -import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.jenkinsci.test.acceptance.po.Jenkins; import org.jenkinsci.test.acceptance.po.Node; public class ScriptResult { - private static final List BUILT_IN_NODE_NAMES = List.of("built-in", "controller", "master"); private final String result; public ScriptResult(String result) { @@ -41,14 +38,7 @@ public ScriptResult(String result) { public String output(Node node) { String name = node.getName(); if (node instanceof Jenkins) { - // TODO: use the below code once Scriptler versions 390 and up are the only ones tested - // return "(" + node + ")"; - return BUILT_IN_NODE_NAMES.stream() - .map(nodeName -> "(" + nodeName + ")") - .map(this::output) - .filter(Objects::nonNull) - .findFirst() - .orElse(null); + name = "(" + node.getName() + ")"; } return output(name); }