Author: jbellis
Date: Wed Feb 23 14:58:19 2011
New Revision: 1073760
URL: http://svn.apache.org/viewvc?rev=1073760&view=rev
Log:
make CliTest less picky about schema update output
patch by jbellis
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java?rev=1073760&r1=1073759&r2=1073760&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
Wed Feb 23 14:58:19 2011
@@ -752,8 +752,8 @@ public class CliClient extends CliUserHe
KsDef updatedKsDef = updateKsDefAttributes(statement,
currentKsDef);
String mySchemaVersion =
thriftClient.system_update_keyspace(updatedKsDef);
- validateSchemaIsSettled(mySchemaVersion);
sessionState.out.println(mySchemaVersion);
+ validateSchemaIsSettled(mySchemaVersion);
keyspacesMap.put(keyspaceName,
thriftClient.describe_keyspace(keyspaceName));
}
catch (InvalidRequestException e)
Modified:
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java?rev=1073760&r1=1073759&r2=1073760&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
(original)
+++
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
Wed Feb 23 14:58:19 2011
@@ -27,6 +27,7 @@ import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
+import java.util.regex.Pattern;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -176,7 +177,7 @@ public class CliTest extends CleanupHelp
assertEquals(errStream.toString() + " processing " + statement,
"", errStream.toString());
if (statement.startsWith("drop ") || statement.startsWith("create
") || statement.startsWith("update "))
{
-
assertTrue(result.matches("(.{8})-(.{4})-(.{4})-(.{4})-(.{12})\n"));
+ assert
Pattern.compile("(.{8})-(.{4})-(.{4})-(.{4})-(.{12}).*",
Pattern.DOTALL).matcher(result).matches() : result;
}
else if (statement.startsWith("set "))
{
