From: Amitay Isaacs <amitay@gmail.com>
Date: Thu, 19 Jul 2018 07:40:40 +0000 (+1000)
Subject: ctdb-tests: Use errcode to translate ETIMEDOUT
X-Git-Tag: ldb-1.5.0~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65cc36f24d8a92c749dbc3700802e1d83a9ceb9f;p=thirdparty%2Fsamba.git

ctdb-tests: Use errcode to translate ETIMEDOUT

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13520

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/tests/takeover_helper/210.sh b/ctdb/tests/takeover_helper/210.sh
index 207949e1165..eacf0242a3f 100755
--- a/ctdb/tests/takeover_helper/210.sh
+++ b/ctdb/tests/takeover_helper/210.sh
@@ -15,11 +15,11 @@ CONTROLFAILS
 
 EOF
 
-required_result 110 <<EOF
+required_error ETIMEDOUT <<EOF
 No nodes available to host public IPs yet
-IPREALLOCATED failed on node 1, ret=110
+IPREALLOCATED failed on node 1, ret=$(errcode ETIMEDOUT)
 Assigning banning credits to node 1
-takeover run failed, ret=110
+takeover run failed, ret=$(errcode ETIMEDOUT)
 EOF
 test_takeover_helper
 
diff --git a/ctdb/tests/takeover_helper/211.sh b/ctdb/tests/takeover_helper/211.sh
index f4eca683d08..27eebe32849 100755
--- a/ctdb/tests/takeover_helper/211.sh
+++ b/ctdb/tests/takeover_helper/211.sh
@@ -24,10 +24,10 @@ CONTROLFAILS
 137	1	TIMEOUT	CTDB_CONTROL_IPREALLOCATED fake timeout
 EOF
 
-required_result 110 <<EOF
-IPREALLOCATED failed on node 1, ret=110
+required_error ETIMEDOUT <<EOF
+IPREALLOCATED failed on node 1, ret=$(errcode ETIMEDOUT)
 Assigning banning credits to node 1
-takeover run failed, ret=110
+takeover run failed, ret=$(errcode ETIMEDOUT)
 EOF
 test_takeover_helper
 
diff --git a/ctdb/tests/takeover_helper/220.sh b/ctdb/tests/takeover_helper/220.sh
index d8c7823c038..84fc1d7192f 100755
--- a/ctdb/tests/takeover_helper/220.sh
+++ b/ctdb/tests/takeover_helper/220.sh
@@ -24,10 +24,10 @@ CONTROLFAILS
 89	1	TIMEOUT	CTDB_CONTROL_TAKEOVER_IP fake timeout
 EOF
 
-required_result 110 <<EOF
-TAKEOVER_IP 10.0.0.32 failed to node 1, ret=110
+required_error ETIMEDOUT <<EOF
+TAKEOVER_IP 10.0.0.32 failed to node 1, ret=$(errcode ETIMEDOUT)
 Assigning banning credits to node 1
-takeover run failed, ret=110
+takeover run failed, ret=$(errcode ETIMEDOUT)
 EOF
 test_takeover_helper
 
diff --git a/ctdb/tests/takeover_helper/230.sh b/ctdb/tests/takeover_helper/230.sh
index 9b77c2b6f76..13ed08b2d56 100755
--- a/ctdb/tests/takeover_helper/230.sh
+++ b/ctdb/tests/takeover_helper/230.sh
@@ -24,11 +24,11 @@ CONTROLFAILS
 88	2	TIMEOUT	CTDB_CONTROL_RELEASE_IP fake timeout
 EOF
 
-required_result 110 <<EOF
-RELEASE_IP 10.0.0.33 failed on node 2, ret=110
-RELEASE_IP 10.0.0.32 failed on node 2, ret=110
+required_error ETIMEDOUT <<EOF
+RELEASE_IP 10.0.0.33 failed on node 2, ret=$(errcode ETIMEDOUT)
+RELEASE_IP 10.0.0.32 failed on node 2, ret=$(errcode ETIMEDOUT)
 Assigning banning credits to node 2
-takeover run failed, ret=110
+takeover run failed, ret=$(errcode ETIMEDOUT)
 EOF
 test_takeover_helper
 
diff --git a/ctdb/tests/takeover_helper/240.sh b/ctdb/tests/takeover_helper/240.sh
index b01b458b0cd..7afb2fc2abb 100755
--- a/ctdb/tests/takeover_helper/240.sh
+++ b/ctdb/tests/takeover_helper/240.sh
@@ -24,10 +24,10 @@ CONTROLFAILS
 90	2	TIMEOUT	CTDB_CONTROL_GET_PUBLIC_IPS fake timeout
 EOF
 
-required_result 110 <<EOF
-control GET_PUBLIC_IPS failed on node 2, ret=110
+required_error ETIMEDOUT <<EOF
+control GET_PUBLIC_IPS failed on node 2, ret=$(errcode ETIMEDOUT)
 Failed to fetch known public IPs
 Assigning banning credits to node 2
-takeover run failed, ret=110
+takeover run failed, ret=$(errcode ETIMEDOUT)
 EOF
 test_takeover_helper
diff --git a/ctdb/tests/takeover_helper/250.sh b/ctdb/tests/takeover_helper/250.sh
index 1422474883e..91c6766b13d 100755
--- a/ctdb/tests/takeover_helper/250.sh
+++ b/ctdb/tests/takeover_helper/250.sh
@@ -24,8 +24,8 @@ CONTROLFAILS
 91	0	TIMEOUT	CTDB_CONTROL_GET_NODEMAP fake timeout
 EOF
 
-required_result 110 <<EOF
-control GET_NODEMAP failed to node 0, ret=110
-takeover run failed, ret=110
+required_error ETIMEDOUT <<EOF
+control GET_NODEMAP failed to node 0, ret=$(errcode ETIMEDOUT)
+takeover run failed, ret=$(errcode ETIMEDOUT)
 EOF
 test_takeover_helper
diff --git a/ctdb/tests/takeover_helper/260.sh b/ctdb/tests/takeover_helper/260.sh
index 645faa2c6cb..7e24e3294eb 100755
--- a/ctdb/tests/takeover_helper/260.sh
+++ b/ctdb/tests/takeover_helper/260.sh
@@ -24,8 +24,8 @@ CONTROLFAILS
 53	0	TIMEOUT	CTDB_CONTROL_GET_ALL_TUNABLES fake timeout
 EOF
 
-required_result 110 <<EOF
-control GET_ALL_TUNABLES failed, ret=110
-takeover run failed, ret=110
+required_error ETIMEDOUT <<EOF
+control GET_ALL_TUNABLES failed, ret=$(errcode ETIMEDOUT)
+takeover run failed, ret=$(errcode ETIMEDOUT)
 EOF
 test_takeover_helper