You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/03/05 05:42:17 UTC
git commit: fix CliTest
Updated Branches:
refs/heads/cassandra-1.2 b1abbf2d0 -> 2d16e2811
fix CliTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d16e281
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d16e281
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d16e281
Branch: refs/heads/cassandra-1.2
Commit: 2d16e2811f26096ddfbf8d25a6eac17e0c9c9e32
Parents: b1abbf2
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 5 07:41:46 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 5 07:41:46 2013 +0300
----------------------------------------------------------------------
test/unit/org/apache/cassandra/cli/CliTest.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d16e281/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 989e400..0a3497b 100644
--- a/test/unit/org/apache/cassandra/cli/CliTest.java
+++ b/test/unit/org/apache/cassandra/cli/CliTest.java
@@ -253,7 +253,14 @@ public class CliTest extends SchemaLoader
CliMain.processStatement(statement);
String result = outStream.toString();
// System.out.println("Result:\n" + result);
- assertEquals(errStream.toString() + " processing " + statement, "", errStream.toString());
+ 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",
+ errStream.toString());
+ else
+ assertEquals(errStream.toString() + " processing " + statement, "", errStream.toString());
+
if (statement.startsWith("drop ") || statement.startsWith("create ") || statement.startsWith("update "))
{
assert Pattern.compile("(.{8})-(.{4})-(.{4})-(.{4})-(.{12}).*", Pattern.DOTALL).matcher(result).matches()