From 3a395b67a3915e97a88ac0668eac51a167207df9 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Wed, 23 Nov 2016 20:40:50 +1100
Subject: [PATCH] ctdb-tests: Use symbolic debug levels in takeover tests

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---
 ctdb/tests/takeover/lcp2.001.sh | 2 +-
 ctdb/tests/takeover/lcp2.002.sh | 2 +-
 ctdb/tests/takeover/lcp2.003.sh | 2 +-
 ctdb/tests/takeover/lcp2.004.sh | 2 +-
 ctdb/tests/takeover/lcp2.005.sh | 2 +-
 ctdb/tests/takeover/lcp2.006.sh | 2 +-
 ctdb/tests/takeover/lcp2.007.sh | 2 +-
 ctdb/tests/takeover/lcp2.008.sh | 2 +-
 ctdb/tests/takeover/lcp2.009.sh | 2 +-
 ctdb/tests/takeover/lcp2.010.sh | 2 +-
 ctdb/tests/takeover/lcp2.011.sh | 2 +-
 ctdb/tests/takeover/lcp2.012.sh | 2 +-
 ctdb/tests/takeover/lcp2.013.sh | 2 +-
 ctdb/tests/takeover/lcp2.014.sh | 2 +-
 ctdb/tests/takeover/lcp2.015.sh | 2 +-
 ctdb/tests/takeover/lcp2.016.sh | 2 +-
 ctdb/tests/takeover/lcp2.017.sh | 2 +-
 ctdb/tests/takeover/lcp2.018.sh | 2 +-
 ctdb/tests/takeover/lcp2.019.sh | 2 +-
 ctdb/tests/takeover/lcp2.020.sh | 2 +-
 ctdb/tests/takeover/lcp2.021.sh | 2 +-
 ctdb/tests/takeover/lcp2.022.sh | 2 +-
 ctdb/tests/takeover/lcp2.023.sh | 2 +-
 ctdb/tests/takeover/lcp2.024.sh | 2 +-
 ctdb/tests/takeover/lcp2.025.sh | 2 +-
 ctdb/tests/takeover/lcp2.026.sh | 2 +-
 ctdb/tests/takeover/lcp2.027.sh | 2 +-
 ctdb/tests/takeover/lcp2.028.sh | 2 +-
 ctdb/tests/takeover/lcp2.029.sh | 2 +-
 ctdb/tests/takeover/lcp2.030.sh | 2 +-
 ctdb/tests/takeover/lcp2.031.sh | 2 +-
 ctdb/tests/takeover/lcp2.032.sh | 2 +-
 ctdb/tests/takeover/lcp2.033.sh | 2 +-
 33 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/ctdb/tests/takeover/lcp2.001.sh b/ctdb/tests/takeover/lcp2.001.sh
index 8772318d6e3..ee5b795bbb5 100755
--- a/ctdb/tests/takeover/lcp2.001.sh
+++ b/ctdb/tests/takeover/lcp2.001.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 3 -> 1 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2
diff --git a/ctdb/tests/takeover/lcp2.002.sh b/ctdb/tests/takeover/lcp2.002.sh
index f3f6f0a6b1a..6489388bd8e 100755
--- a/ctdb/tests/takeover/lcp2.002.sh
+++ b/ctdb/tests/takeover/lcp2.002.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 3 -> 2 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2
diff --git a/ctdb/tests/takeover/lcp2.003.sh b/ctdb/tests/takeover/lcp2.003.sh
index f6cfe57b2d9..bdf2699d314 100755
--- a/ctdb/tests/takeover/lcp2.003.sh
+++ b/ctdb/tests/takeover/lcp2.003.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 1 -> all healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2
diff --git a/ctdb/tests/takeover/lcp2.004.sh b/ctdb/tests/takeover/lcp2.004.sh
index e8bfb292b02..7ce97c3d945 100755
--- a/ctdb/tests/takeover/lcp2.004.sh
+++ b/ctdb/tests/takeover/lcp2.004.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 1 -> all healthy, info logging"
 
-export CTDB_TEST_LOGLEVEL=3
+export CTDB_TEST_LOGLEVEL=INFO
 
 required_result <<EOF
 ${TEST_DATE_STAMP}1 [-121363] -> 192.168.20.253 -> 0 [+0]
diff --git a/ctdb/tests/takeover/lcp2.005.sh b/ctdb/tests/takeover/lcp2.005.sh
index 2ac56523043..f579a948474 100755
--- a/ctdb/tests/takeover/lcp2.005.sh
+++ b/ctdb/tests/takeover/lcp2.005.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 1 -> all healthy, debug logging"
 
-export CTDB_TEST_LOGLEVEL=4
+export CTDB_TEST_LOGLEVEL=DEBUG
 
 required_result <<EOF
 ${TEST_DATE_STAMP} ----------------------------------------
diff --git a/ctdb/tests/takeover/lcp2.006.sh b/ctdb/tests/takeover/lcp2.006.sh
index 13bb40fd69c..c527992281c 100755
--- a/ctdb/tests/takeover/lcp2.006.sh
+++ b/ctdb/tests/takeover/lcp2.006.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 0 -> 1 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 1
diff --git a/ctdb/tests/takeover/lcp2.007.sh b/ctdb/tests/takeover/lcp2.007.sh
index 76fa06e212a..a5140256d9d 100755
--- a/ctdb/tests/takeover/lcp2.007.sh
+++ b/ctdb/tests/takeover/lcp2.007.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 0 -> 2 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 1
diff --git a/ctdb/tests/takeover/lcp2.008.sh b/ctdb/tests/takeover/lcp2.008.sh
index f5c0af3a7c6..6387223cced 100755
--- a/ctdb/tests/takeover/lcp2.008.sh
+++ b/ctdb/tests/takeover/lcp2.008.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 0 -> all healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 0
diff --git a/ctdb/tests/takeover/lcp2.009.sh b/ctdb/tests/takeover/lcp2.009.sh
index e862c928070..1b0c350ca98 100755
--- a/ctdb/tests/takeover/lcp2.009.sh
+++ b/ctdb/tests/takeover/lcp2.009.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 3 healthy -> all disconnected"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 -1
diff --git a/ctdb/tests/takeover/lcp2.010.sh b/ctdb/tests/takeover/lcp2.010.sh
index 20b1c98e65e..f7dabdd03e9 100755
--- a/ctdb/tests/takeover/lcp2.010.sh
+++ b/ctdb/tests/takeover/lcp2.010.sh
@@ -11,7 +11,7 @@ define_test "2 disjoint groups of nodes/addresses, a node becomes healthy"
 # group has 6 addresses then the "necessarily" goes away and the
 # smaller group won't be rebalanced.
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.209.102 3
diff --git a/ctdb/tests/takeover/lcp2.011.sh b/ctdb/tests/takeover/lcp2.011.sh
index f752aa345e3..1f10bd16c11 100755
--- a/ctdb/tests/takeover/lcp2.011.sh
+++ b/ctdb/tests/takeover/lcp2.011.sh
@@ -6,7 +6,7 @@ define_test "2 disjoint groups of nodes/addresses, continue a stopped node"
 
 # Another LCP2 1.0 bug
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 10.11.19.46 3
diff --git a/ctdb/tests/takeover/lcp2.012.sh b/ctdb/tests/takeover/lcp2.012.sh
index 8f5c537e967..6f95f0bef02 100755
--- a/ctdb/tests/takeover/lcp2.012.sh
+++ b/ctdb/tests/takeover/lcp2.012.sh
@@ -4,7 +4,7 @@
 
 define_test "Node with NODE_FLAGS_NOIPTAKEOVER doesn't gain IPs"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 1
diff --git a/ctdb/tests/takeover/lcp2.013.sh b/ctdb/tests/takeover/lcp2.013.sh
index fb9d724e35f..bc2116aff6b 100755
--- a/ctdb/tests/takeover/lcp2.013.sh
+++ b/ctdb/tests/takeover/lcp2.013.sh
@@ -4,7 +4,7 @@
 
 define_test "Node with NODE_FLAGS_NOIPTAKEOVER doesn't lose IPs"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2
diff --git a/ctdb/tests/takeover/lcp2.014.sh b/ctdb/tests/takeover/lcp2.014.sh
index 36eda9284b4..0fc7c00fdb0 100755
--- a/ctdb/tests/takeover/lcp2.014.sh
+++ b/ctdb/tests/takeover/lcp2.014.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all unhealthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 0
diff --git a/ctdb/tests/takeover/lcp2.015.sh b/ctdb/tests/takeover/lcp2.015.sh
index a2569e05b23..b8f8172cf37 100755
--- a/ctdb/tests/takeover/lcp2.015.sh
+++ b/ctdb/tests/takeover/lcp2.015.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, all unhealthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2
diff --git a/ctdb/tests/takeover/lcp2.016.sh b/ctdb/tests/takeover/lcp2.016.sh
index 2e2df1b9d0e..a4e369253fa 100755
--- a/ctdb/tests/takeover/lcp2.016.sh
+++ b/ctdb/tests/takeover/lcp2.016.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, 2->3 unhealthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 1
diff --git a/ctdb/tests/takeover/lcp2.017.sh b/ctdb/tests/takeover/lcp2.017.sh
index 07b22fb9f99..2490d649d68 100755
--- a/ctdb/tests/takeover/lcp2.017.sh
+++ b/ctdb/tests/takeover/lcp2.017.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all unhealthy, NoIPHostOnAllDisabled"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 export CTDB_SET_NoIPHostOnAllDisabled=1
 
 required_result <<EOF
diff --git a/ctdb/tests/takeover/lcp2.018.sh b/ctdb/tests/takeover/lcp2.018.sh
index 4a797f78c62..f6fc4ceaa38 100755
--- a/ctdb/tests/takeover/lcp2.018.sh
+++ b/ctdb/tests/takeover/lcp2.018.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, all unhealthy, NoIPHostOnAllDisabled"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 export CTDB_SET_NoIPHostOnAllDisabled=1
 
 required_result <<EOF
diff --git a/ctdb/tests/takeover/lcp2.019.sh b/ctdb/tests/takeover/lcp2.019.sh
index 0d8937cdc54..6309bd5bd9f 100755
--- a/ctdb/tests/takeover/lcp2.019.sh
+++ b/ctdb/tests/takeover/lcp2.019.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, 2->3 unhealthy, NoIPHostOnAllDisabled"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 export CTDB_SET_NoIPHostOnAllDisabled=1
 
 required_result <<EOF
diff --git a/ctdb/tests/takeover/lcp2.020.sh b/ctdb/tests/takeover/lcp2.020.sh
index e3fe3c4e405..a8897e05a2a 100755
--- a/ctdb/tests/takeover/lcp2.020.sh
+++ b/ctdb/tests/takeover/lcp2.020.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, 2->3 unhealthy, NoIPHostOnAllDisabled on 2"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2
diff --git a/ctdb/tests/takeover/lcp2.021.sh b/ctdb/tests/takeover/lcp2.021.sh
index 7dcddb14ee8..4d185f2477b 100755
--- a/ctdb/tests/takeover/lcp2.021.sh
+++ b/ctdb/tests/takeover/lcp2.021.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, 3->2 unhealthy, NoIPHostOnAllDisabled on 2 others"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 0
diff --git a/ctdb/tests/takeover/lcp2.022.sh b/ctdb/tests/takeover/lcp2.022.sh
index 01aa13aa27a..77089b03ceb 100755
--- a/ctdb/tests/takeover/lcp2.022.sh
+++ b/ctdb/tests/takeover/lcp2.022.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 2->3 unhealthy, all IPs assigned, split NoIPTakeover"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 # We expect 1/2 the IPs to move, but the rest to stay (as opposed to
 # NoIPHostOnAllDisabled)
diff --git a/ctdb/tests/takeover/lcp2.023.sh b/ctdb/tests/takeover/lcp2.023.sh
index c29546e849b..0935083f1da 100755
--- a/ctdb/tests/takeover/lcp2.023.sh
+++ b/ctdb/tests/takeover/lcp2.023.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, 1->3 unhealthy"
 
-export CTDB_TEST_LOGLEVEL=4
+export CTDB_TEST_LOGLEVEL=DEBUG
 
 required_result <<EOF
 ${TEST_DATE_STAMP} ----------------------------------------
diff --git a/ctdb/tests/takeover/lcp2.024.sh b/ctdb/tests/takeover/lcp2.024.sh
index f76bc83df41..d297084adb4 100755
--- a/ctdb/tests/takeover/lcp2.024.sh
+++ b/ctdb/tests/takeover/lcp2.024.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all healthy, all in STARTUP runstate"
 
-export CTDB_TEST_LOGLEVEL=2
+export CTDB_TEST_LOGLEVEL=NOTICE
 
 required_result <<EOF
 ${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.21.254
diff --git a/ctdb/tests/takeover/lcp2.025.sh b/ctdb/tests/takeover/lcp2.025.sh
index 44b8583edc0..f52282eef2e 100755
--- a/ctdb/tests/takeover/lcp2.025.sh
+++ b/ctdb/tests/takeover/lcp2.025.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all healthy, 1 in STARTUP runstate"
 
-export CTDB_TEST_LOGLEVEL=2
+export CTDB_TEST_LOGLEVEL=NOTICE
 
 required_result <<EOF
 192.168.21.254 1
diff --git a/ctdb/tests/takeover/lcp2.026.sh b/ctdb/tests/takeover/lcp2.026.sh
index 4c22ba56074..a6e7a94ebb2 100755
--- a/ctdb/tests/takeover/lcp2.026.sh
+++ b/ctdb/tests/takeover/lcp2.026.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all unhealthy, 1 in STARTUP runstate"
 
-export CTDB_TEST_LOGLEVEL=2
+export CTDB_TEST_LOGLEVEL=NOTICE
 
 required_result <<EOF
 192.168.21.254 1
diff --git a/ctdb/tests/takeover/lcp2.027.sh b/ctdb/tests/takeover/lcp2.027.sh
index 20e0f28f950..f572b47f620 100755
--- a/ctdb/tests/takeover/lcp2.027.sh
+++ b/ctdb/tests/takeover/lcp2.027.sh
@@ -4,7 +4,7 @@
 
 define_test "4 nodes, all IPs assigned, 3->4 unhealthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 130.216.30.181 0
diff --git a/ctdb/tests/takeover/lcp2.028.sh b/ctdb/tests/takeover/lcp2.028.sh
index 60d22d94174..b0a8ef51c3b 100755
--- a/ctdb/tests/takeover/lcp2.028.sh
+++ b/ctdb/tests/takeover/lcp2.028.sh
@@ -4,7 +4,7 @@
 
 define_test "4 nodes, all healthy/assigned, stays unbalanced"
 
-export CTDB_TEST_LOGLEVEL=3
+export CTDB_TEST_LOGLEVEL=INFO
 
 required_result <<EOF
 130.216.30.181 0
diff --git a/ctdb/tests/takeover/lcp2.029.sh b/ctdb/tests/takeover/lcp2.029.sh
index fe4d2465279..53549630132 100755
--- a/ctdb/tests/takeover/lcp2.029.sh
+++ b/ctdb/tests/takeover/lcp2.029.sh
@@ -4,7 +4,7 @@
 
 define_test "4 nodes, some IPs unassigned on target nodes"
 
-export CTDB_TEST_LOGLEVEL=3
+export CTDB_TEST_LOGLEVEL=INFO
 
 required_result <<EOF
 ${TEST_DATE_STAMP} 10.19.99.251 -> 2 [+9216]
diff --git a/ctdb/tests/takeover/lcp2.030.sh b/ctdb/tests/takeover/lcp2.030.sh
index 739757b0b17..87a7f580110 100755
--- a/ctdb/tests/takeover/lcp2.030.sh
+++ b/ctdb/tests/takeover/lcp2.030.sh
@@ -4,7 +4,7 @@
 
 define_test "900 IPs, 5 nodes, 0 -> 5 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.10.90 0
diff --git a/ctdb/tests/takeover/lcp2.031.sh b/ctdb/tests/takeover/lcp2.031.sh
index be10866f531..3a2cb79b278 100755
--- a/ctdb/tests/takeover/lcp2.031.sh
+++ b/ctdb/tests/takeover/lcp2.031.sh
@@ -4,7 +4,7 @@
 
 define_test "12+4 IPs, 4 nodes, 3 -> 4 healthy"
 
-export CTDB_TEST_LOGLEVEL=4
+export CTDB_TEST_LOGLEVEL=DEBUG
 
 required_result <<EOF
 ${TEST_DATE_STAMP} ----------------------------------------
diff --git a/ctdb/tests/takeover/lcp2.032.sh b/ctdb/tests/takeover/lcp2.032.sh
index e9df6eb95e6..fa032f48557 100755
--- a/ctdb/tests/takeover/lcp2.032.sh
+++ b/ctdb/tests/takeover/lcp2.032.sh
@@ -4,7 +4,7 @@
 
 define_test "12+4 IPs, 4 nodes, multiple transitions"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 set -e
 
diff --git a/ctdb/tests/takeover/lcp2.033.sh b/ctdb/tests/takeover/lcp2.033.sh
index a4f6e5f247a..206699a52ac 100755
--- a/ctdb/tests/takeover/lcp2.033.sh
+++ b/ctdb/tests/takeover/lcp2.033.sh
@@ -4,7 +4,7 @@
 
 define_test "12+4 IPs, 4 nodes, 2 -> 3 -> 4 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 set -e
 
-- 
2.11.4.GIT