You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2019/05/22 02:50:47 UTC

[hbase] 19/26: HBASE-22295 Fix TestClientOperationTimeout

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch HBASE-21512
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 30c4610e8ae6383898b3c1302172e4550af8fcda
Author: zhangduo <zh...@apache.org>
AuthorDate: Tue Apr 23 21:54:31 2019 +0800

    HBASE-22295 Fix TestClientOperationTimeout
    
    Signed-off-by: Michael Stack <st...@apache.org>
---
 .../test/java/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 2ce34a9..52f0c7d 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;