From 6ab21791da75f165bd880f5ee89c30bedc41fe64 Mon Sep 17 00:00:00 2001 From: Apekshit Sharma Date: Thu, 28 Sep 2017 12:35:41 -0700 Subject: [PATCH] HBASE-18902 TestCoprocessorServiceBackwardCompatibility fails in master branch. Change-Id: I961f73b336a7f2e35c9d1697c2ef10d0657d1bc1 --- .../TestCoprocessorServiceBackwardCompatibility.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorServiceBackwardCompatibility.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorServiceBackwardCompatibility.java index c2ff36e0be..c63d6a7978 100644 --- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorServiceBackwardCompatibility.java +++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorServiceBackwardCompatibility.java @@ -28,7 +28,9 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.*; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; +import org.junit.After; import org.junit.AfterClass; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -40,7 +42,7 @@ import static org.junit.Assert.assertEquals; */ @Category({SmallTests.class}) public class TestCoprocessorServiceBackwardCompatibility { - private static HBaseTestingUtility TEST_UTIL = null; + private static HBaseTestingUtility TEST_UTIL; private static Configuration CONF = null; public static class DummyCoprocessorService extends DummyService @@ -65,15 +67,15 @@ public class TestCoprocessorServiceBackwardCompatibility { } } - @BeforeClass - public static void setupBeforeClass() throws Exception { + @Before + public void setup() throws Exception { TEST_UTIL = new HBaseTestingUtility(); CONF = TEST_UTIL.getConfiguration(); DummyCoprocessorService.numCalls = 0; } - @AfterClass - public static void tearDownAfterClass() throws Exception { + @After + public void tearDown() throws Exception { TEST_UTIL.shutdownMiniCluster(); } -- 2.14.1