HBASE-13668 TestFlushRegionEntry is flaky
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f49111e5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f49111e5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f49111e5 Branch: refs/heads/hbase-12439 Commit: f49111e5f8a2db8f3065188f03c7ad6d4411bd10 Parents: 3fa0bf3 Author: Andrew Purtell <[email protected]> Authored: Sat May 16 11:20:04 2015 -0700 Committer: Andrew Purtell <[email protected]> Committed: Sat May 16 16:28:10 2015 -0700 ---------------------------------------------------------------------- .../regionserver/TestFlushRegionEntry.java | 37 ++++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f49111e5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushRegionEntry.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushRegionEntry.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushRegionEntry.java index bd50f59..abd8c59 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushRegionEntry.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushRegionEntry.java @@ -10,31 +10,42 @@ */ package org.apache.hadoop.hbase.regionserver; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.*; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.testclassification.RegionServerTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.regionserver.MemStoreFlusher.FlushRegionEntry; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.ManualEnvironmentEdge; -import org.junit.After; -import org.junit.Before; +import org.apache.hadoop.hbase.regionserver.MemStoreFlusher.FlushRegionEntry; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.mockito.Mockito; -@Category({RegionServerTests.class, SmallTests.class}) +@Category({RegionServerTests.class, MediumTests.class}) public class TestFlushRegionEntry { - @Before - public void setUp() throws Exception { + + @BeforeClass + public static void setUp() throws Exception { ManualEnvironmentEdge edge = new ManualEnvironmentEdge(); edge.setValue(12345); EnvironmentEdgeManager.injectEdge(edge); } + @AfterClass + public static void teardown() { + EnvironmentEdgeManager.reset(); + } + @Test - public void test() { - HRegion r = Mockito.mock(HRegion.class); + public void testFlushRegionEntryEquality() { + HRegionInfo hri = new HRegionInfo(1, TableName.valueOf("TestTable"), 0); + HRegion r = mock(HRegion.class); + doReturn(hri).when(r).getRegionInfo(); + FlushRegionEntry entry = new FlushRegionEntry(r, true); FlushRegionEntry other = new FlushRegionEntry(r, true); @@ -42,8 +53,4 @@ public class TestFlushRegionEntry { assertEquals(entry, other); } - @After - public void teardown() { - EnvironmentEdgeManager.reset(); - } } \ No newline at end of file
