Remove outdated nocommit and tweak assert to output bad exception message on failure.

This commit is contained in:
Ryan Ernst 2016-03-06 11:34:10 -08:00
parent ed7934ee79
commit 5a94f8b3e6
2 changed files with 2 additions and 2 deletions

View File

@ -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();
}

View File

@ -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());
}
}