ctdb-tests: Drop ps_ctdbd()

This was used for debugging tests by ensuring that the arguments to
ctdbd were as expected.  It no longer outputs anything useful because
ctdbd is now started without arguments.

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

diff --git a/ctdb/tests/simple/19_ip_takeover_noop.sh b/ctdb/tests/simple/19_ip_takeover_noop.sh
index 0b86241db2a8480d81fe6050eff3343c14556b9f..f369988274e28e8bbef5c416c254dddaded8fa06 100755 (executable)
--- a/ctdb/tests/simple/19_ip_takeover_noop.sh
+++ b/ctdb/tests/simple/19_ip_takeover_noop.sh
@@ -66,5 +66,3 @@ try_command_on_node any $CTDB ipreallocate
 
 echo "Good, that seems to work!"
 echo
-
-ps_ctdbd

diff --git a/ctdb/tests/simple/28_zero_eventscripts.sh b/ctdb/tests/simple/28_zero_eventscripts.sh
index cb476a495f1d3d3a52a9fcd2a85005ee1a633f33..b360ab8768959d4fb4073cc09559d10292906fd7 100755 (executable)
--- a/ctdb/tests/simple/28_zero_eventscripts.sh
+++ b/ctdb/tests/simple/28_zero_eventscripts.sh
@@ -34,8 +34,6 @@ daemons_start
 
 wait_until_ready
 
-ps_ctdbd
-
 echo "Good, that seems to work!"
 
 daemons_stop

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index f4a32aa5289f24c0ed39b622fc49888ede6eed4f..572b87be64b699e358558a2b9298ab76b75861df 100644 (file)
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -220,16 +220,6 @@ _ctdb_start_all ()
        daemons_start
 }
 
-ps_ctdbd ()
-{
-       # If this fails to find processes then the tests fails, so
-       # look at full command-line so this will work with valgrind.
-       # Note that the output could be generated with pgrep's -a
-       # option but it doesn't exist in older versions.
-       ps -p $(pgrep -f '\<ctdbd\>' | xargs | sed -e 's| |,|g') -o args ww
-       echo
-}
-
 # onnode will use CTDB_BASES to help the ctdb tool connection to each
 # daemon
 export CTDB_BASES=""