Repository: hbase Updated Branches: refs/heads/branch-1 420baa42c -> 109f138ca
HBASE-13731 TestReplicationAdmin should clean up MiniZKCluster resource (Stephen Jiang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/109f138c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/109f138c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/109f138c Branch: refs/heads/branch-1 Commit: 109f138ca3a013108fffa54efbfc09486d66f7ff Parents: 420baa4 Author: tedyu <[email protected]> Authored: Thu May 21 10:25:51 2015 -0700 Committer: tedyu <[email protected]> Committed: Thu May 21 10:25:51 2015 -0700 ---------------------------------------------------------------------- .../hbase/client/replication/TestReplicationAdmin.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/109f138c/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java index 8a83608..7e4ae63 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java @@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.replication.ReplicationException; import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -67,6 +68,14 @@ public class TestReplicationAdmin { admin = new ReplicationAdmin(conf); } + @AfterClass + public static void tearDownAfterClass() throws Exception { + if (admin != null) { + admin.close(); + } + TEST_UTIL.shutdownMiniZKCluster(); + } + /** * Simple testing of adding and removing peers, basically shows that * all interactions with ZK work
