Repository: hbase Updated Branches: refs/heads/branch-1.0 c18b36a33 -> dc47beb6c
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/dc47beb6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dc47beb6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dc47beb6 Branch: refs/heads/branch-1.0 Commit: dc47beb6cf446b534eb9a58d8f05f5b6b6e26802 Parents: c18b36a Author: tedyu <yuzhih...@gmail.com> Authored: Thu May 21 10:25:51 2015 -0700 Committer: Enis Soztutar <e...@apache.org> Committed: Thu May 21 11:07:24 2015 -0700 ---------------------------------------------------------------------- .../hbase/client/replication/TestReplicationAdmin.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/dc47beb6/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 c0c662f..1a5dd33 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
