You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2015/03/30 19:54:23 UTC

phoenix git commit: PHOENIX-1790 Fix test failures due to incorrect shadowing of @AfterClass methods. (Samarth Jain)

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.x fcedbe6a4 -> 0d74cff28


PHOENIX-1790 Fix test failures due to incorrect shadowing of @AfterClass methods. (Samarth Jain)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0d74cff2
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0d74cff2
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0d74cff2

Branch: refs/heads/4.x-HBase-1.x
Commit: 0d74cff2889aa259142091b830d7e181935e890d
Parents: fcedbe6
Author: Thomas <td...@salesforce.com>
Authored: Mon Mar 30 10:53:31 2015 -0700
Committer: Thomas <td...@salesforce.com>
Committed: Mon Mar 30 10:53:31 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/0d74cff2/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/0d74cff2/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();
     }