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:58:56 UTC
[15/50] [abbrv] git commit: ACCUMULO-802 minor fixes of variables
that got clobbered in rebase
ACCUMULO-802 minor fixes of variables that got clobbered in rebase
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5bcd3d29
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5bcd3d29
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5bcd3d29
Branch: refs/heads/master
Commit: 5bcd3d2966f321847085bc1d62fe39e2e7234609
Parents: 02374a0
Author: Sean Hickey <ta...@gmail.com>
Authored: Thu Aug 8 15:05:16 2013 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Dec 4 18:46:10 2013 -0500
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/test/ShellServerIT.java | 2 +-
.../test/java/org/apache/accumulo/test/TableNamespacesIT.java | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5bcd3d29/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 792ba3e..e60e414 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@ -719,7 +719,7 @@ public class ShellServerIT extends SimpleMacIT {
@Test(timeout = 30 * 1000)
public void systempermission() throws Exception {
exec("systempermissions");
- assertEquals(8, output.get().split("\n").length - 1);
+ assertEquals(11, output.get().split("\n").length - 1);
exec("tablepermissions", true);
assertEquals(6, output.get().split("\n").length - 1);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5bcd3d29/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 1a52f72..38955e3 100644
--- a/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java
@@ -395,8 +395,6 @@ public class TableNamespacesIT {
}
/**
-<<<<<<< HEAD
-<<<<<<< HEAD
* Tests that when a table moves to a new namespace that it's properties inherit from the new namespace and not the old one
*/
@Test
@@ -435,11 +433,8 @@ public class TableNamespacesIT {
assertTrue(!hasProp);
}
/**
- * Tests new Namespace permissions as well as modifications to Table permissions because of namespaces
-=======
* Tests new Namespace permissions as well as modifications to Table permissions because of namespaces. Checks each permission to first make sure the user
* doesn't have permission to perform the action, then root grants them the permission and we check to make sure they could perform the action.
->>>>>>> ACCUMULO-1479 finished initial implementation of table namespace permissions, including tests
*/
@Test
public void testPermissions() throws Exception {
@@ -447,7 +442,7 @@ public class TableNamespacesIT {
PasswordToken pass = new PasswordToken(secret);
- String n1 = "namespace1";
+ String n1 = "spaceOfTheName";
String user1 = "dude";