svn commit: r1513289 - /hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

[ec...@apache.org]

Author: eclark
Date: Mon Aug 12 22:49:39 2013
New Revision: 1513289

URL: http://svn.apache.org/r1513289
Log:
HBASE-9192 IntegrationTestBigLinkedListWithChaosMonkey never exits if there is an error

Modified:
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java?rev=1513289&r1=1513288&r2=1513289&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java (original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java Mon Aug 12 22:49:39 2013
@@ -128,10 +128,16 @@ public class IntegrationTestBigLinkedLis
     test.NUM_SLAVES_BASE = 3;
     test.setUp();
 
-    // run the test
-    int ret = ToolRunner.run(test.getTestingUtil().getConfiguration(), test, args);
+    int ret = -1;
+
+    try {
+      // run the test
+      ret = ToolRunner.run(test.getTestingUtil().getConfiguration(), test, args);
+    }finally {
+      // Make 100% sure that the monkey stops.
+      test.tearDown();
+    }
 
-    test.tearDown();
     System.exit(ret);
   }
 }