From 127bef4d101ac677d2b4875305d402528d4b81a6 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Tue, 23 Apr 2019 21:54:31 +0800 Subject: [PATCH] HBASE-22295 Fix TestClientOperationTimeout Signed-off-by: Michael Stack --- .../org/apache/hadoop/hbase/TestClientOperationTimeout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java index 2ce34a93ac5..52f0c7dfc20 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java @@ -120,7 +120,7 @@ public class TestClientOperationTimeout { * Tests that a get on a table throws {@link SocketTimeoutException} when the operation takes * longer than 'hbase.client.operation.timeout'. */ - @Test(expected = SocketTimeoutException.class) + @Test(expected = RetriesExhaustedException.class) public void testGetTimeout() throws Exception { DELAY_GET = 600; TABLE.get(new Get(ROW)); @@ -130,7 +130,7 @@ public class TestClientOperationTimeout { * Tests that a put on a table throws {@link SocketTimeoutException} when the operation takes * longer than 'hbase.client.operation.timeout'. */ - @Test(expected = SocketTimeoutException.class) + @Test(expected = RetriesExhaustedException.class) public void testPutTimeout() throws Exception { DELAY_MUTATE = 600;