You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/12/05 00:57:54 UTC
[02/50] [abbrv] git commit: ACCUMULO-802 fixed tests to work
correctly for cloning namespaces
ACCUMULO-802 fixed tests to work correctly for cloning namespaces
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b267fc45
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b267fc45
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b267fc45
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b267fc45984ee0976bda97fb409572f26a9e4d65
Parents: 8a7adbd
Author: Sean Hickey <ta...@gmail.com>
Authored: Mon Jul 29 11:34:52 2013 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Dec 4 18:46:09 2013 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/ShellServerIT.java | 14 +++++++-------
.../org/apache/accumulo/test/TableNamespacesIT.java | 7 +++++--
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b267fc45/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index e4d0dba..62be33c 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@ -862,13 +862,13 @@ public class ShellServerIT extends SimpleMacIT {
exec("online -tn thing2", true);
exec("flush -tn thing2", true);
exec("compact -tn thing2", true);
- exec("createnamespace testers", true);
- exec("createtable testers.1", true);
- exec("createtable testers.2", true);
- exec("deletetable -tn testers -f", true);
- exec("tables", true, "testers.1", false);
- exec("namespaces", true, "testers", true);
- exec("deletenamespace testers -f", true);
+ exec("createnamespace testers3", true);
+ exec("createtable testers3.1", true);
+ exec("createtable testers3.2", true);
+ exec("deletetable -tn testers3 -f", true);
+ exec("tables", true, "testers3.1", false);
+ exec("namespaces", true, "testers3", true);
+ exec("deletenamespace testers3 -f", true);
// properties override and such
exec("config -tn thing2 -s table.file.max=44444", true);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b267fc45/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java b/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java
index edc5422..c52b844 100644
--- a/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
+import java.util.Set;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
@@ -348,11 +349,13 @@ public class TableNamespacesIT {
Map<String,String> propsToSet = new HashMap<String,String>();
propsToSet.put(propKey1, propVal1);
- c.tableNamespaceOperations().clone(n1, n3, true, propsToSet, null, true);
+ Set<String> propsToExclude = new HashSet<String>();
+ propsToExclude.add(propKey2);
+ c.tableNamespaceOperations().clone(n1, n3, true, propsToSet, propsToExclude, true);
assertTrue(checkTableNamespaceHasProp(c, n3, propKey1, propVal1));
assertTrue(checkTableHasProp(c, n3 + t, propKey1, propVal2));
- assertTrue(checkTableNamespaceHasProp(c, n3, propKey2, propVal3));
+ assertTrue(!checkTableNamespaceHasProp(c, n3, propKey2, propVal3));
assertTrue(!checkTableHasProp(c, n3 + t, propKey2, propVal3));
}