ctdb-tests: Drop unused ctdb stub scriptstatus and xpnn commands

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

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index f401d7a7ec207c6e44a0a478701627517f5e759c..36de880bc4cdf5f617e51ab3a5d702be38546d58 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -331,10 +331,6 @@ setup_ctdb ()
     mkdir -p "$FAKE_CTDB_IFACES_DOWN"
     rm -f "$FAKE_CTDB_IFACES_DOWN"/*
 
-    export FAKE_CTDB_SCRIPTSTATUS="$FAKE_CTDB_STATE/scriptstatus"
-    mkdir -p "$FAKE_CTDB_SCRIPTSTATUS"
-    rm -f "$FAKE_CTDB_SCRIPTSTATUS"/*
-
     export CTDB_PARTIALLY_ONLINE_INTERFACES
 
     export FAKE_CTDB_TUNABLES_OK="MonitorInterval TDBMutexEnabled DatabaseHashSize"
@@ -457,18 +453,6 @@ ctdb_not_implemented ()
 DEBUG: ctdb: command \"$1\" not implemented in stub"
 }
 
-ctdb_fake_scriptstatus ()
-{
-    _code="$1"
-    _status="$2"
-    _err_out="$3"
-
-    _d1=$(date '+%s.%N')
-    _d2=$(date '+%s.%N')
-
-    echo "$_code $_status $_err_out" >"$FAKE_CTDB_SCRIPTSTATUS/$script"
-}
-
 ######################################################################
 
 setup_ctdb_policy_routing ()

diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/eventscripts/stubs/ctdb
index 0976a13790bd5c02b009bd1513508c510db9a427..e8c0b68087e5929db566491883f1feadb424b3e0 100755 (executable)
--- a/ctdb/tests/eventscripts/stubs/ctdb
+++ b/ctdb/tests/eventscripts/stubs/ctdb
@@ -456,34 +456,9 @@ case "$1" in
 
        exit 0
        ;;
-    scriptstatus)
-       $machine_readable || not_implemented "$1, without -X"
-       [ "$2" != "all" ] || not_implemented "scriptstatus all"
-       # For now just assume everything is good.
-       echo "|Type|Name|Code|Status|Start|End|Error Output...|"
-       for _i in "$CTDB_BASE/events.d/"*.* ; do
-           _d1=$(date '+%s.%N')
-           _b="${_i##*/}" # basename
-
-           _f="$FAKE_CTDB_SCRIPTSTATUS/$_b"
-           if [ -r "$_f" ] ; then
-               read _code _status _err_out <"$_f"
-           else
-               _code="0"
-               _status="OK"
-               if [ ! -x "$_i" ] ; then
-                   _status="DISABLED"
-                   _code="-8"
-               fi
-               _err_out=""
-           fi
-           _d2=$(date '+%s.%N')
-           echo "|${2:-monitor}|${_b}|${_code}|${_status}|${_d1}|${_d2}|${_err_out}|"
-       done
-       ;;
     gratarp) : ;;  # Do nothing for now
     ip)            ctdb_ip "$@" ;;
-    pnn|xpnn)      ctdb_pnn ;;
+    pnn)          ctdb_pnn ;;
     enable)        ctdb_enable "$@";;
     disable)       ctdb_disable "$@";;
     moveip) shift ; ctdb_moveip "$@";;