[kudu] branch master updated: [kudu-tool-test] more robust ConnectionNegotiationTimeoutOption

[alexey]

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

alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new fae44610a [kudu-tool-test] more robust 
ConnectionNegotiationTimeoutOption
fae44610a is described below

commit fae44610a8af0d26463f4342847a4e37c7808f91
Author: Alexey Serbin <ale...@apache.org>
AuthorDate: Mon Jun 6 21:46:52 2022 -0700

    [kudu-tool-test] more robust ConnectionNegotiationTimeoutOption
    
    This patch updates the expected message on connection negotiation
    timeout in the ToolTest.ConnectionNegotiationTimeoutOption scenario,
    making it more robust.
    
    Change-Id: I9a34fc03f67c2ae3b5ff6b4f746dd87d79634c52
    Reviewed-on: http://gerrit.cloudera.org:8080/18594
    Reviewed-by: Mahesh Reddy <mre...@cloudera.com>
    Tested-by: Alexey Serbin <ale...@apache.org>
    Reviewed-by: Attila Bukor <abu...@apache.org>
---
 src/kudu/tools/kudu-tool-test.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/kudu/tools/kudu-tool-test.cc b/src/kudu/tools/kudu-tool-test.cc
index c77fe502d..2f8329f35 100644
--- a/src/kudu/tools/kudu-tool-test.cc
+++ b/src/kudu/tools/kudu-tool-test.cc
@@ -7784,8 +7784,11 @@ TEST_F(ToolTest, ConnectionNegotiationTimeoutOption) {
     auto s = RunActionStderrString(Substitute(kPattern, rpc_addr, 10, 11), 
&msg);
     ASSERT_TRUE(s.IsRuntimeError());
     ASSERT_STR_CONTAINS(msg, Substitute(
-        "Timed out: Client connection negotiation failed: client connection to 
"
-        "$0: received 0 of 4 requested bytes", rpc_addr));
+        "Timed out: Client connection negotiation failed: "
+        "client connection to $0", rpc_addr));
+    ASSERT_STR_MATCHES(msg,
+        "(Timeout exceeded waiting to connect)|"
+        "(received|sent) 0 of .* requested bytes");
   }
 
   {