accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cjno...@apache.org
Subject git commit: Pulling back ACCUMULO-1672 changes from master.
Date Wed, 11 Sep 2013 01:39:35 GMT
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT cd135831c -> e80dfc420


Pulling back ACCUMULO-1672 changes from master.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e80dfc42
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e80dfc42
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e80dfc42

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: e80dfc420ae90be818b15d5c3e8b90649332dee8
Parents: cd13583
Author: Corey J. Nolet <cjnolet@gmail.com>
Authored: Tue Sep 10 21:38:33 2013 -0400
Committer: Corey J. Nolet <cjnolet@gmail.com>
Committed: Tue Sep 10 21:38:33 2013 -0400

----------------------------------------------------------------------
 proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e80dfc42/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
index 708c930..3e7e977 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
@@ -54,6 +54,7 @@ import org.apache.accumulo.core.iterators.user.VersioningIterator;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint;
 import org.apache.accumulo.minicluster.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.MiniAccumuloConfig;
 import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client;
 import org.apache.accumulo.proxy.thrift.AccumuloSecurityException;
 import org.apache.accumulo.proxy.thrift.ActiveCompaction;
@@ -137,7 +138,9 @@ public class SimpleTest {
   @BeforeClass
   public static void setupMiniCluster() throws Exception {
     folder.create();
-    accumulo = new MiniAccumuloCluster(folder.getRoot(), secret);
+    MiniAccumuloConfig config = new MiniAccumuloConfig(folder.getRoot(), secret)
+            .setNumTservers (1);
+    accumulo = new MiniAccumuloCluster(config);
     accumulo.start();
     
     Properties props = new Properties();
@@ -942,6 +945,7 @@ public class SimpleTest {
     } catch (MutationsRejectedException ex) {}
     
     client.removeConstraint(creds, TABLE_TEST, 1);
+    assertEquals(0, client.listConstraints(creds, TABLE_TEST).size());
     client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "x"));
     String scanner = client.createScanner(creds, TABLE_TEST, null);
     ScanResult more = client.nextK(scanner, 2);


Mime
View raw message