[2/2] git commit: ACCUMULO-2841 Change test to use default timeout and SimpleMacIT

[ct...@apache.org]

ACCUMULO-2841 Change test to use default timeout and SimpleMacIT


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

Branch: refs/heads/master
Commit: 117d5c5c8addd488c9de980f1cf7f1811bc38411
Parents: 6eedd1f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 14:16:08 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 14:16:08 2014 -0400

----------------------------------------------------------------------
 .../test/ArbitraryTablePropertiesIT.java        | 25 +++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/117d5c5c/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java b/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java
index 20bd0b4..7d2f184 100644
--- a/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.test;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -26,25 +24,18 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.security.TablePermission;
-import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
-import org.apache.accumulo.test.functional.ConfigurableMacIT;
-import org.apache.hadoop.conf.Configuration;
+import org.apache.accumulo.test.functional.SimpleMacIT;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ArbitraryTablePropertiesIT extends ConfigurableMacIT {
+public class ArbitraryTablePropertiesIT extends SimpleMacIT {
 
-  @Override
-  public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
-    cfg.setNumTservers(1);
-
-    Map<String,String> siteConfig = new HashMap<String,String>();
-    siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "50ms");
-    cfg.setSiteConfig(siteConfig);
-  }
+  protected int defaultTimeoutSeconds() {
+    return 30;
+  };
 
   // Test set, get, and remove arbitrary table properties on the root account
-  @Test(timeout = 60 * 1000)
+  @Test
   public void setGetRemoveTablePropertyRoot() throws Exception {
     log.debug("Starting setGetRemoveTablePropertyRoot test ------------------------");
 
@@ -95,7 +86,7 @@ public class ArbitraryTablePropertiesIT extends ConfigurableMacIT {
   }
 
   // Tests set, get, and remove of user added arbitrary properties using a non-root account with permissions to alter tables
-  @Test(timeout = 60 * 1000)
+  @Test
   public void userSetGetRemoveTablePropertyWithPermission() throws Exception {
     log.debug("Starting userSetGetRemoveTablePropertyWithPermission test ------------------------");
 
@@ -155,7 +146,7 @@ public class ArbitraryTablePropertiesIT extends ConfigurableMacIT {
   }
 
   // Tests set and get of user added arbitrary properties using a non-root account without permissions to alter tables
-  @Test(timeout = 60 * 1000)
+  @Test
   public void userSetGetTablePropertyWithoutPermission() throws Exception {
     log.debug("Starting userSetGetTablePropertyWithoutPermission test ------------------------");