PHOENIX-1790 Fix test failures due to incorrect shadowing of @AfterClass methods.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2bf8c678 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2bf8c678 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2bf8c678 Branch: refs/heads/calcite Commit: 2bf8c6788efb6dad7513f7bb14d2e9d75d7b50e3 Parents: 2c0ed10 Author: Samarth <samarth.j...@salesforce.com> Authored: Mon Mar 30 09:01:14 2015 -0700 Committer: Samarth <samarth.j...@salesforce.com> Committed: Mon Mar 30 09:01:14 2015 -0700 ---------------------------------------------------------------------- .../src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java | 2 +- .../src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2bf8c678/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java index c079a30..deb14db 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java @@ -57,7 +57,7 @@ public class PhoenixClientRpcIT extends BaseOwnClusterHBaseManagedTimeIT { } @AfterClass - public static void doTeardown() throws Exception { + public static void cleanUpAfterTestSuite() throws Exception { TestPhoenixIndexRpcSchedulerFactory.reset(); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/2bf8c678/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java index de0ab84..b04f636 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java @@ -76,7 +76,7 @@ public class PhoenixServerRpcIT extends BaseOwnClusterHBaseManagedTimeIT { } @AfterClass - public static void doTeardown() throws Exception { + public static void cleanUpAfterTestSuite() throws Exception { TestPhoenixIndexRpcSchedulerFactory.reset(); }
