Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 483b134fc -> 98a4d2904
PHOENIX-2578 PhoenixIndexRPCSchedulerTest isn't shutting down the thread pool Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/98a4d290 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/98a4d290 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/98a4d290 Branch: refs/heads/4.x-HBase-1.0 Commit: 98a4d2904e3ea78cc23378360c03366e39fa4438 Parents: 483b134 Author: Samarth <[email protected]> Authored: Wed Jan 6 22:19:36 2016 -0800 Committer: Samarth <[email protected]> Committed: Wed Jan 6 22:20:22 2016 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/98a4d290/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java b/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java index 12f1863..24ba131 100644 --- a/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java +++ b/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java @@ -60,7 +60,8 @@ public class PhoenixIndexRpcSchedulerTest { queue.poll(20, TimeUnit.SECONDS); Mockito.verify(mock, Mockito.times(2)).init(Mockito.any(Context.class)); - Mockito.verifyNoMoreInteractions(mock); + scheduler.stop(); + executor.stop(); } /** @@ -82,7 +83,7 @@ public class PhoenixIndexRpcSchedulerTest { Mockito.verify(mock, Mockito.times(4)).init(Mockito.any(Context.class)); Mockito.verify(mock, Mockito.times(4)).dispatch(Mockito.any(CallRunner.class)); - Mockito.verifyNoMoreInteractions(mock); + scheduler.stop(); } private void dispatchCallWithPriority(RpcScheduler scheduler, int priority) throws Exception { @@ -97,5 +98,6 @@ public class PhoenixIndexRpcSchedulerTest { Mockito.verify(task).getCall(); Mockito.verifyNoMoreInteractions(task); + server.stop(); } } \ No newline at end of file
