git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 22c3078)
ctdb-tests: Use errcode to translate ETIMEDOUT
authorAmitay Isaacs <amitay@gmail.com>
Thu, 19 Jul 2018 07:40:40 +0000 (17:40 +1000)
committerMartin Schwenke <martins@samba.org>
Sat, 28 Jul 2018 01:50:11 +0000 (03:50 +0200)
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>
ctdb/tests/takeover_helper/210.sh patch | blob | history
ctdb/tests/takeover_helper/211.sh patch | blob | history
ctdb/tests/takeover_helper/220.sh patch | blob | history
ctdb/tests/takeover_helper/230.sh patch | blob | history
ctdb/tests/takeover_helper/240.sh patch | blob | history
ctdb/tests/takeover_helper/250.sh patch | blob | history
ctdb/tests/takeover_helper/260.sh patch | blob | history

diff --git a/ctdb/tests/takeover_helper/210.sh b/ctdb/tests/takeover_helper/210.sh
index 207949e1165d7aa224dcda65c4181a67f9cd2c33..eacf0242a3f16be2d109ad8a027e28f1766e1f55 100755 (executable)
--- 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 f4eca683d084b523cdce1c6facdd160ca846e546..27eebe3284984cfd53c9bf40bbd5a45d1050f804 100755 (executable)
--- 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 d8c7823c03835a85f3042d5af34e8d207e8c7b3a..84fc1d7192f2be9b2098039432e3689cb3c3961b 100755 (executable)
--- 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 9b77c2b6f7637e452ce28733ff0e447540ba9f5c..13ed08b2d56c5a3813315b7d1f37c539541981fd 100755 (executable)
--- 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 b01b458b0cd03b49d823036e7b8af0165ffad8a9..7afb2fc2abb663437ce2af5232f1b8c1e4b7123c 100755 (executable)
--- 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 1422474883e701d045509f1734dedb1332ddc8c6..91c6766b13d3bed39a69d8508180b7356251f876 100755 (executable)
--- 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 645faa2c6cbf26512b730c18a63b2b360c83b4bd..7e24e3294ebb2c24d2fdcebf0ceb825484fbc46b 100755 (executable)
--- 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
Samba Shared Repository