fix CliTest on Windows patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7194
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd6a2295 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd6a2295 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd6a2295 Branch: refs/heads/trunk Commit: dd6a2295991be002e2fb85201b43297a105bd1a4 Parents: e00878d Author: Jonathan Ellis <[email protected]> Authored: Wed May 21 13:21:05 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 21 13:21:05 2014 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/cli/CliTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd6a2295/test/unit/org/apache/cassandra/cli/CliTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cli/CliTest.java b/test/unit/org/apache/cassandra/cli/CliTest.java index 6b7232c..5d28c70 100644 --- a/test/unit/org/apache/cassandra/cli/CliTest.java +++ b/test/unit/org/apache/cassandra/cli/CliTest.java @@ -253,8 +253,8 @@ public class CliTest extends SchemaLoader // System.out.println("Result:\n" + result); if (statement.startsWith("show schema")) assertEquals(errStream.toString() + "processing" + statement, - "\nWARNING: CQL3 tables are intentionally omitted from 'show schema' output.\n" - + "See https://issues.apache.org/jira/browse/CASSANDRA-4377 for details.\n\n", + "\nWARNING: CQL3 tables are intentionally omitted from 'show schema' output." + String.format("%n") + + "See https://issues.apache.org/jira/browse/CASSANDRA-4377 for details.\n" + String.format("%n"), errStream.toString()); else assertEquals(errStream.toString() + " processing " + statement, "", errStream.toString());
