commit 79a89beb2edfc7d56a60ee49a5752f63f23ad8bd Author: Michael Stack Date: Wed Nov 29 20:43:54 2017 -0800 HBASE-19383 [1.2] java.lang.AssertionError: expected:<2> but was:<1> at org.apache.hadoop.hbase.TestChoreService.testTriggerNowFailsWhenNotScheduled(TestChoreService.java:707) diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java index e5546f6cb1..826c8db81e 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java @@ -689,35 +689,6 @@ public class TestChoreService { } @Test (timeout=20000) - public void testTriggerNowFailsWhenNotScheduled() throws InterruptedException { - final int period = 100; - // Small sleep time buffer to allow CountingChore to complete - final int sleep = 5; - ChoreService service = new ChoreService("testTriggerNowFailsWhenNotScheduled"); - CountingChore chore = new CountingChore("dn", period); - - try { - assertFalse(chore.triggerNow()); - assertTrue(chore.getCountOfChoreCalls() == 0); - - service.scheduleChore(chore); - Thread.sleep(sleep); - assertEquals(1, chore.getCountOfChoreCalls()); - Thread.sleep(period); - assertEquals(2, chore.getCountOfChoreCalls()); - assertTrue(chore.triggerNow()); - Thread.sleep(sleep); - assertTrue(chore.triggerNow()); - Thread.sleep(sleep); - assertTrue(chore.triggerNow()); - Thread.sleep(sleep); - assertEquals(5, chore.getCountOfChoreCalls()); - } finally { - shutdownService(service); - } - } - - @Test (timeout=20000) public void testStopperForScheduledChores() throws InterruptedException { ChoreService service = new ChoreService("testStopperForScheduledChores"); Stoppable stopperForGroup1 = new SampleStopper();