You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/05/09 17:28:54 UTC

[16/50] [abbrv] git commit: ACCUMULO-378 Fix test failure on permission propagation from jenkins

ACCUMULO-378 Fix test failure on permission propagation from jenkins


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

Branch: refs/heads/ACCUMULO-378
Commit: f4f7c94840e288ec6ee59adb02d1d6c02d3af3ec
Parents: 05de21f
Author: Josh Elser <el...@apache.org>
Authored: Sat May 3 11:32:34 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat May 3 11:32:34 2014 -0400

----------------------------------------------------------------------
 .../accumulo/test/replication/ReplicationWithMakerTest.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4f7c948/test/src/test/java/org/apache/accumulo/test/replication/ReplicationWithMakerTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationWithMakerTest.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationWithMakerTest.java
index 1c056ed..613a01b 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationWithMakerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationWithMakerTest.java
@@ -32,6 +32,7 @@ import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection;
 import org.apache.accumulo.core.replication.ReplicationTarget;
 import org.apache.accumulo.core.replication.StatusUtil;
 import org.apache.accumulo.core.replication.proto.Replication.Status;
+import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
@@ -282,13 +283,19 @@ public class ReplicationWithMakerTest extends ConfigurableMacIT {
     attempts = 5;
     do {
       if (!exists) {
-        UtilWaitThread.sleep(200);
+        UtilWaitThread.sleep(500);
         exists = conn.tableOperations().exists(ReplicationTable.NAME);
         attempts--;
       }
     } while (!exists && attempts > 0);
     Assert.assertTrue("Replication table did not exist", exists);
 
+    for (int i = 0; i < 5 && !conn.securityOperations().hasTablePermission("root", ReplicationTable.NAME, TablePermission.READ); i++) {
+      Thread.sleep(1000);
+    }
+
+    Assert.assertTrue(conn.securityOperations().hasTablePermission("root", ReplicationTable.NAME, TablePermission.READ));
+
     boolean notFound = true;
     Scanner s;
     for (int i = 0; i < 10 && notFound; i++) {