From 7401d9daa6e26a6f83c598e62680af633790a192 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 4 Jul 2018 12:15:59 -0700 Subject: [PATCH] Revert "Better log output to console (#17)" This reverts commit 16a05c9c2baa18fbf89304778f96829ac4752359. --- .../plugins/textfinder/TextFinderPublisher.java | 4 ++-- .../textfinder/TextFinderPublisherAgentTest.java | 4 ++-- .../TextFinderPublisherFreestyleTest.java | 8 ++++---- .../TextFinderPublisherPipelineTest.java | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/hudson/plugins/textfinder/TextFinderPublisher.java b/src/main/java/hudson/plugins/textfinder/TextFinderPublisher.java index 225aac1..d4986f5 100644 --- a/src/main/java/hudson/plugins/textfinder/TextFinderPublisher.java +++ b/src/main/java/hudson/plugins/textfinder/TextFinderPublisher.java @@ -126,14 +126,14 @@ private void findText(Run run, FilePath workspace, TaskListener listener) boolean foundText = false; if (alsoCheckConsoleOutput) { - logger.println("Looking for pattern " + "'" + regexp + "'" + " in the console output"); + logger.println("Checking console output"); foundText |= checkFile(run.getLogFile(), compilePattern(logger, regexp), logger, true); } else { // printing this when checking console output will cause the plugin // to find this line, which would be pointless. // doing this only when fileSet!=null to avoid - logger.println("Looking for pattern " + "'" + regexp + "'" + " in the file " + "'" + build.getLogFile() + "'"); + logger.println("Checking " + regexp); } final RemoteOutputStream ros = new RemoteOutputStream(logger); diff --git a/src/test/java/hudson/plugins/textfinder/TextFinderPublisherAgentTest.java b/src/test/java/hudson/plugins/textfinder/TextFinderPublisherAgentTest.java index 85b0c5e..dc26bc1 100644 --- a/src/test/java/hudson/plugins/textfinder/TextFinderPublisherAgentTest.java +++ b/src/test/java/hudson/plugins/textfinder/TextFinderPublisherAgentTest.java @@ -62,7 +62,7 @@ public void failureIfFoundInFileOnAgent() throws Exception { agent.getNodeName(), agent.getNodeName()))); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern " + "'" + UNIQUE_TEXT + "'" + " in the file " + "'" + build.getLogFile() + "'", build); + rule.assertLogContains("Checking foobar", build); assertLogContainsMatch(new File(getWorkspace(build), "out.txt"), UNIQUE_TEXT, build, false); rule.assertBuildStatus(Result.FAILURE, build); } @@ -79,7 +79,7 @@ public void failureIfFoundInConsoleOnAgent() throws Exception { agent.getNodeName(), agent.getNodeName()))); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern " + "'" + ECHO_UNIQUE_TEXT + "'" + " in the console output", build); + rule.assertLogContains("Checking console output", build); assertLogContainsMatch(build.getLogFile(), ECHO_UNIQUE_TEXT, build, true); rule.assertBuildStatus(Result.FAILURE, build); } diff --git a/src/test/java/hudson/plugins/textfinder/TextFinderPublisherFreestyleTest.java b/src/test/java/hudson/plugins/textfinder/TextFinderPublisherFreestyleTest.java index 7906033..a24bd95 100644 --- a/src/test/java/hudson/plugins/textfinder/TextFinderPublisherFreestyleTest.java +++ b/src/test/java/hudson/plugins/textfinder/TextFinderPublisherFreestyleTest.java @@ -48,7 +48,7 @@ public void successIfFoundInConsole() throws Exception { project.getPublishersList().add(textFinder); FreeStyleBuild build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern " + "'" + UNIQUE_TEXT + "'" + " in the console output", build); + rule.assertLogContains("Checking console output", build); assertLogContainsMatch(build.getLogFile(), ECHO_UNIQUE_TEXT, build, true); rule.assertBuildStatus(Result.SUCCESS, build); } @@ -66,7 +66,7 @@ public void failureIfFoundInConsole() throws Exception { project.getPublishersList().add(textFinder); FreeStyleBuild build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern " + "'" + UNIQUE_TEXT + "'" + " in the console output", build); + rule.assertLogContains("Checking console output", build); assertLogContainsMatch(build.getLogFile(), ECHO_UNIQUE_TEXT, build, true); rule.assertBuildStatus(Result.FAILURE, build); } @@ -85,7 +85,7 @@ public void unstableIfFoundInConsole() throws Exception { project.getPublishersList().add(textFinder); FreeStyleBuild build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern " + "'" + UNIQUE_TEXT + "'" + " in the console output", build); + rule.assertLogContains("Checking console output", build); assertLogContainsMatch(build.getLogFile(), ECHO_UNIQUE_TEXT, build, true); rule.assertBuildStatus(Result.UNSTABLE, build); } @@ -98,7 +98,7 @@ public void notFoundInConsole() throws Exception { project.getPublishersList().add(textFinder); FreeStyleBuild build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern " + "'" + UNIQUE_TEXT + "'" + " in the console output", build); + rule.assertLogContains("Checking console output", build); rule.assertBuildStatus(Result.SUCCESS, build); } } diff --git a/src/test/java/hudson/plugins/textfinder/TextFinderPublisherPipelineTest.java b/src/test/java/hudson/plugins/textfinder/TextFinderPublisherPipelineTest.java index 1e63b4a..648abf3 100644 --- a/src/test/java/hudson/plugins/textfinder/TextFinderPublisherPipelineTest.java +++ b/src/test/java/hudson/plugins/textfinder/TextFinderPublisherPipelineTest.java @@ -58,7 +58,7 @@ public void successIfFoundInFile() throws Exception { + "node {findText regexp: 'foobar', fileSet: 'out.txt', succeedIfFound: true}\n")); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern 'foobar' in the file " + "'" + build.getLogFile() + "'", build); + rule.assertLogContains("Checking foobar", build); assertLogContainsMatch(new File(getWorkspace(build), "out.txt"), UNIQUE_TEXT, build, false); rule.assertBuildStatus(Result.SUCCESS, build); } @@ -72,7 +72,7 @@ public void failureIfFoundInFile() throws Exception { + "node {findText regexp: 'foobar', fileSet: 'out.txt'}\n")); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern 'foobar' in the file " + "'" + build.getLogFile() + "'", build); + rule.assertLogContains("Checking foobar", build); assertLogContainsMatch(new File(getWorkspace(build), "out.txt"), UNIQUE_TEXT, build, false); rule.assertBuildStatus(Result.FAILURE, build); } @@ -86,7 +86,7 @@ public void unstableIfFoundInFile() throws Exception { + "node {findText regexp: 'foobar', fileSet: 'out.txt', unstableIfFound: true}\n")); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern 'foobar' in the file " + "'" + build.getLogFile() + "'", build); + rule.assertLogContains("Checking foobar", build); assertLogContainsMatch(new File(getWorkspace(build), "out.txt"), UNIQUE_TEXT, build, false); rule.assertBuildStatus(Result.UNSTABLE, build); } @@ -114,7 +114,7 @@ public void notFoundInFile() throws Exception { + "node {findText regexp: 'foobar', fileSet: 'out.txt'}\n")); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern 'foobar' in the file " + "'" + build.getLogFile() + "'", build); + rule.assertLogContains("Checking foobar", build); rule.assertBuildStatus(Result.SUCCESS, build); } @@ -127,7 +127,7 @@ public void successIfFoundInConsole() throws Exception { + "node {findText regexp: 'foobar', succeedIfFound: true, alsoCheckConsoleOutput: true}\n")); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern 'foobar' in the console output", build); + rule.assertLogContains("Checking console output", build); assertLogContainsMatch(build.getLogFile(), ECHO_UNIQUE_TEXT, build, true); rule.assertBuildStatus(Result.SUCCESS, build); } @@ -141,7 +141,7 @@ public void failureIfFoundInConsole() throws Exception { + "node {findText regexp: 'foobar', alsoCheckConsoleOutput: true}\n")); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern 'foobar' in the console output", build); + rule.assertLogContains("Checking console output", build); assertLogContainsMatch(build.getLogFile(), ECHO_UNIQUE_TEXT, build, true); rule.assertBuildStatus(Result.FAILURE, build); } @@ -155,7 +155,7 @@ public void unstableIfFoundInConsole() throws Exception { + "node {findText regexp: 'foobar', unstableIfFound: true, alsoCheckConsoleOutput: true}\n")); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern 'foobar' in the console output", build); + rule.assertLogContains("Checking console output", build); assertLogContainsMatch(build.getLogFile(), ECHO_UNIQUE_TEXT, build, true); rule.assertBuildStatus(Result.UNSTABLE, build); } @@ -182,7 +182,7 @@ public void notFoundInConsole() throws Exception { "node {findText regexp: 'foobar', alsoCheckConsoleOutput: true}\n")); WorkflowRun build = project.scheduleBuild2(0).get(); rule.waitForCompletion(build); - rule.assertLogContains("Looking for pattern 'foobar' in the console output", build); + rule.assertLogContains("Checking console output", build); rule.assertBuildStatus(Result.SUCCESS, build); } }