[JENKINS-72181] Restore flushed output for groovy CLI command (#8622)

jenkinsci · Oct 20, 2023 · 8f5167d · 8f5167d
1 parent f613605
commit 8f5167d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/main/java/hudson/cli/GroovyCommand.java b/core/src/main/java/hudson/cli/GroovyCommand.java
@@ -68,7 +68,7 @@ protected int run() throws Exception {
         final String scriptListenerCorrelationId = String.valueOf(System.identityHashCode(this));
 
         Binding binding = new Binding();
-        binding.setProperty("out", new ScriptListener.ListenerWriter(new PrintWriter(new OutputStreamWriter(stdout, getClientCharset()), true), GroovyCommand.class, null, scriptListenerCorrelationId, User.current()));
+        binding.setProperty("out", new PrintWriter(new ScriptListener.ListenerWriter(new OutputStreamWriter(stdout, getClientCharset()), GroovyCommand.class, null, scriptListenerCorrelationId, User.current()), true));
         binding.setProperty("stdin", stdin);
         binding.setProperty("stdout", stdout);
         binding.setProperty("stderr", stderr);

diff --git a/test/src/test/java/jenkins/model/ScriptListenerTest.java b/test/src/test/java/jenkins/model/ScriptListenerTest.java
@@ -79,7 +79,9 @@ public void groovyCliUsageIsLogged() {
         logging.record(DefaultScriptListener.class.getName(), Level.FINEST).capture(100);
 
         InputStream scriptStream = new ByteArrayInputStream(script.getBytes());
-        new CLICommandInvoker(j, "groovy").withArgs("=").withStdin(scriptStream).invoke();
+        final CLICommandInvoker.Result result = new CLICommandInvoker(j, "groovy").withArgs("=").withStdin(scriptStream).invoke();
+        final String stdout = result.stdout();
+        assertThat(stdout, containsString("hello from groovy CLI"));
 
         { // DefaultScriptListener
             final List<String> messages = logging.getMessages();