accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/7] git commit: ACCUMULO-3243 Remove explicit timeout on ShutdownIT
Date Tue, 04 Nov 2014 19:17:12 GMT
ACCUMULO-3243 Remove explicit timeout on ShutdownIT


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

Branch: refs/heads/1.6
Commit: 73f37597afc612e4491f7b5fdc2b754af350fdd1
Parents: b965b2e
Author: Josh Elser <elserj@apache.org>
Authored: Tue Nov 4 13:43:55 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Nov 4 14:16:09 2014 -0500

----------------------------------------------------------------------
 .../accumulo/test/functional/ShutdownIT.java       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/73f37597/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
index 2ee4738..1b9aa21 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
@@ -33,20 +33,20 @@ import org.apache.accumulo.test.VerifyIngest;
 import org.junit.Test;
 
 public class ShutdownIT extends ConfigurableMacIT {
-  
+
   @Override
   protected int defaultTimeoutSeconds() {
     return 2 * 60;
   }
 
-  @Test(timeout = 4 * 60 * 1000)
+  @Test
   public void shutdownDuringIngest() throws Exception {
     Process ingest = cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z",
cluster.getZooKeepers(), "-u", "root", "-p", ROOT_PASSWORD, "--createTable");
     UtilWaitThread.sleep(100);
     assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
     ingest.destroy();
   }
-  
+
   @Test
   public void shutdownDuringQuery() throws Exception {
     assertEquals(0, cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z",
cluster.getZooKeepers(), "-u", "root","-p", ROOT_PASSWORD, "--createTable").waitFor());
@@ -55,7 +55,7 @@ public class ShutdownIT extends ConfigurableMacIT {
     assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
     verify.destroy();
   }
-  
+
   @Test
   public void shutdownDuringDelete() throws Exception {
     assertEquals(0, cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z",
cluster.getZooKeepers(), "-u", "root", "-p", ROOT_PASSWORD, "--createTable").waitFor());
@@ -65,7 +65,7 @@ public class ShutdownIT extends ConfigurableMacIT {
     deleter.destroy();
   }
 
-  
+
   @Test
   public void shutdownDuringDeleteTable() throws Exception {
     final Connector c = getConnector();
@@ -74,6 +74,7 @@ public class ShutdownIT extends ConfigurableMacIT {
     }
     final AtomicReference<Exception> ref = new AtomicReference<Exception>();
     Thread async = new Thread() {
+      @Override
       public void run() {
         try {
           for (int i = 0; i < 10; i++)
@@ -89,12 +90,12 @@ public class ShutdownIT extends ConfigurableMacIT {
     if (ref.get() != null)
       throw ref.get();
   }
-  
-  @Test(timeout = 4 * 60 * 1000)
+
+  @Test
   public void stopDuringStart() throws Exception {
     assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
   }
-  
+
   @Test
   public void adminStop() throws Exception {
     runAdminStopTest(getConnector(), cluster);


Mime
View raw message