File tree Expand file tree Collapse file tree 1 file changed +1
-11
lines changed
src/main/java/org/jenkinsci/test/acceptance/plugins/scriptler Expand file tree Collapse file tree 1 file changed +1
-11
lines changed Original file line number Diff line number Diff line change 23
23
*/
24
24
package org .jenkinsci .test .acceptance .plugins .scriptler ;
25
25
26
- import java .util .List ;
27
- import java .util .Objects ;
28
26
import java .util .regex .Matcher ;
29
27
import java .util .regex .Pattern ;
30
28
import org .jenkinsci .test .acceptance .po .Jenkins ;
31
29
import org .jenkinsci .test .acceptance .po .Node ;
32
30
33
31
public class ScriptResult {
34
- private static final List <String > BUILT_IN_NODE_NAMES = List .of ("built-in" , "controller" , "master" );
35
32
private final String result ;
36
33
37
34
public ScriptResult (String result ) {
@@ -41,14 +38,7 @@ public ScriptResult(String result) {
41
38
public String output (Node node ) {
42
39
String name = node .getName ();
43
40
if (node instanceof Jenkins ) {
44
- // TODO: use the below code once Scriptler versions 390 and up are the only ones tested
45
- // return "(" + node + ")";
46
- return BUILT_IN_NODE_NAMES .stream ()
47
- .map (nodeName -> "(" + nodeName + ")" )
48
- .map (this ::output )
49
- .filter (Objects ::nonNull )
50
- .findFirst ()
51
- .orElse (null );
41
+ name = "(" + node .getName () + ")" ;
52
42
}
53
43
return output (name );
54
44
}
You can’t perform that action at this time.
0 commit comments