From 5a94f8b3e6ce1152e126456639d59e7e7dbb63c2 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Sun, 6 Mar 2016 11:34:10 -0800 Subject: [PATCH] Remove outdated nocommit and tweak assert to output bad exception message on failure. --- .../test/java/org/elasticsearch/common/cli/TerminalTests.java | 3 ++- .../org/elasticsearch/bootstrap/BootstrapCliParserTests.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/org/elasticsearch/common/cli/TerminalTests.java b/core/src/test/java/org/elasticsearch/common/cli/TerminalTests.java index 9326cc16233..deb64e906b4 100644 --- a/core/src/test/java/org/elasticsearch/common/cli/TerminalTests.java +++ b/core/src/test/java/org/elasticsearch/common/cli/TerminalTests.java @@ -46,7 +46,8 @@ public class TerminalTests extends CliToolTestCase { private void assertPrinted(MockTerminal logTerminal, Terminal.Verbosity verbosity, String text) throws Exception { logTerminal.println(verbosity, text); - assertTrue(logTerminal.getOutput().contains(text)); + String output = logTerminal.getOutput(); + assertTrue(output, output.contains(text)); logTerminal.resetOutput(); } diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/BootstrapCliParserTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/BootstrapCliParserTests.java index 8700ca8a5fe..c172999e7cb 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/BootstrapCliParserTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/BootstrapCliParserTests.java @@ -233,7 +233,6 @@ public class BootstrapCliParserTests extends CliToolTestCase { BootstrapCLIParser parser = new BootstrapCLIParser(terminal); ExitStatus status = parser.execute(args(tuple.v1())); assertStatus(status, OK_AND_EXIT); - // nocommit assertTerminalOutputContainsHelpFile(terminal, "/org/elasticsearch/bootstrap/" + tuple.v2()); } }