summaryrefslogtreecommitdiff
path: root/ctdb/tests/tool
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2016-07-22 17:14:52 +1000
committerAmitay Isaacs <amitay@samba.org>2016-07-25 21:29:44 +0200
commiteafa12ec228f8bdc9e9924ae5b83d0e18dadab0d (patch)
treec0a3ddca4cfea483d10e60b0fa200f1688f99299 /ctdb/tests/tool
parent2b2a7a9269a7031cd8d4840af2b9d8e74101f38d (diff)
downloadsamba-eafa12ec228f8bdc9e9924ae5b83d0e18dadab0d.tar.gz
ctdb-tests: Drop ctdb tool debug level to NOTICE
Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/tests/tool')
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.001.sh3
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.011.sh6
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.012.sh4
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.013.sh2
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.014.sh4
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.015.sh2
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.016.sh4
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.017.sh2
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.018.sh6
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.019.sh4
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.020.sh4
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.021.sh5
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.023.sh4
-rwxr-xr-xctdb/tests/tool/ctdb.reloadnodes.024.sh3
-rw-r--r--ctdb/tests/tool/scripts/local.sh2
15 files changed, 1 insertions, 54 deletions
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.001.sh b/ctdb/tests/tool/ctdb.reloadnodes.001.sh
index 24cd94af76c..68d6cfb5b3b 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.001.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.001.sh
@@ -18,9 +18,6 @@ NODEMAP
EOF
ok <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
-Node 2 is unchanged
No change in nodes file, skipping unnecessary reload
EOF
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.011.sh b/ctdb/tests/tool/ctdb.reloadnodes.011.sh
index 41a5566af91..261962e97e2 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.011.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.011.sh
@@ -19,13 +19,7 @@ NODEMAP
EOF
required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
-Node 2 is unchanged
Node 3 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 1
-Reloading nodes file on node 2
EOF
simple_test
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.012.sh b/ctdb/tests/tool/ctdb.reloadnodes.012.sh
index 4ebb6aed740..c3ca0fe3911 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.012.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.012.sh
@@ -18,11 +18,7 @@ NODEMAP
EOF
required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
Node 2 is DELETED
-Reloading nodes file on node 0
-Reloading nodes file on node 1
EOF
simple_test
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.013.sh b/ctdb/tests/tool/ctdb.reloadnodes.013.sh
index 4156839a00b..1402b9dcb6d 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.013.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.013.sh
@@ -18,8 +18,6 @@ NODEMAP
EOF
required_result 1 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
Node 2 is DELETED
ERROR: Node 2 is still connected
ERROR: Nodes will not be reloaded due to previous error
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.014.sh b/ctdb/tests/tool/ctdb.reloadnodes.014.sh
index 1a005a164bc..30e51485b6f 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.014.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.014.sh
@@ -19,10 +19,6 @@ EOF
required_result 0 <<EOF
Node 0 is DELETED
-Node 1 is unchanged
-Node 2 is unchanged
-Reloading nodes file on node 1
-Reloading nodes file on node 2
EOF
simple_test
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.015.sh b/ctdb/tests/tool/ctdb.reloadnodes.015.sh
index 14c3c314668..5fad9ded590 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.015.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.015.sh
@@ -20,8 +20,6 @@ EOF
required_result 1 <<EOF
Node 0 is DELETED
ERROR: Node 0 is still connected
-Node 1 is unchanged
-Node 2 is unchanged
ERROR: Nodes will not be reloaded due to previous error
EOF
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.016.sh b/ctdb/tests/tool/ctdb.reloadnodes.016.sh
index a239a7cf151..d444a46c85f 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.016.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.016.sh
@@ -18,11 +18,7 @@ NODEMAP
EOF
required_result 0 <<EOF
-Node 0 is unchanged
Node 1 is DELETED
-Node 2 is unchanged
-Reloading nodes file on node 0
-Reloading nodes file on node 2
EOF
simple_test
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.017.sh b/ctdb/tests/tool/ctdb.reloadnodes.017.sh
index e5f20301357..b9a969410f6 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.017.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.017.sh
@@ -18,10 +18,8 @@ NODEMAP
EOF
required_result 1 <<EOF
-Node 0 is unchanged
Node 1 is DELETED
ERROR: Node 1 is still connected
-Node 2 is unchanged
ERROR: Nodes will not be reloaded due to previous error
EOF
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.018.sh b/ctdb/tests/tool/ctdb.reloadnodes.018.sh
index 5f994d1fb3a..30be5961552 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.018.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.018.sh
@@ -21,15 +21,9 @@ NODEMAP
EOF
required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
-Node 2 is unchanged
Node 3 is NEW
Node 4 is NEW
Node 5 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 1
-Reloading nodes file on node 2
EOF
simple_test
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.019.sh b/ctdb/tests/tool/ctdb.reloadnodes.019.sh
index c40ae52fad0..5069485b811 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.019.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.019.sh
@@ -20,13 +20,9 @@ NODEMAP
EOF
required_result 0 <<EOF
-Node 0 is unchanged
Node 1 is DELETED
-Node 2 is unchanged
Node 3 is NEW
Node 4 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 2
EOF
simple_test
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.020.sh b/ctdb/tests/tool/ctdb.reloadnodes.020.sh
index da197a5ad52..66384c935bb 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.020.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.020.sh
@@ -20,13 +20,9 @@ NODEMAP
EOF
required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
Node 2 is DELETED
Node 3 is NEW
Node 4 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 1
EOF
simple_test
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.021.sh b/ctdb/tests/tool/ctdb.reloadnodes.021.sh
index 8ec51e85b5a..0f5f0d58d46 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.021.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.021.sh
@@ -19,13 +19,8 @@ NODEMAP
EOF
required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
WARNING: Node 1 is disconnected. You MUST fix this node manually!
-Node 2 is unchanged
Node 3 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 2
EOF
simple_test
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.023.sh b/ctdb/tests/tool/ctdb.reloadnodes.023.sh
index 931ba38c794..b3823d30be4 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.023.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.023.sh
@@ -18,11 +18,7 @@ NODEMAP
EOF
ok <<EOF
-Node 0 is unchanged
Node 1 is UNDELETED
-Node 2 is unchanged
-Reloading nodes file on node 0
-Reloading nodes file on node 2
EOF
simple_test
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.024.sh b/ctdb/tests/tool/ctdb.reloadnodes.024.sh
index cf6cd9bbc86..9aa0d4255e6 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.024.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.024.sh
@@ -18,9 +18,6 @@ NODEMAP
EOF
ok <<EOF
-Node 0 is unchanged
-Node 1 is unchanged (DELETED)
-Node 2 is unchanged
No change in nodes file, skipping unnecessary reload
EOF
diff --git a/ctdb/tests/tool/scripts/local.sh b/ctdb/tests/tool/scripts/local.sh
index 1c88d812130..1230b1121b9 100644
--- a/ctdb/tests/tool/scripts/local.sh
+++ b/ctdb/tests/tool/scripts/local.sh
@@ -20,7 +20,7 @@ define_test ()
_cmd="${_f#ctdb.}"
_cmd="${_cmd%.*}" # Strip test number
export CTDB="$VALGRIND ctdb --socket $ctdbd_socket"
- export CTDB_DEBUGLEVEL=3
+ export CTDB_DEBUGLEVEL=2
test_args="$_cmd"
;;
*)
View Lorry Controller Status