ctdb-tests: Automate expected NFS test results instead of hard-coding

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

diff --git a/ctdb/tests/eventscripts/60.ganesha.monitor.131.sh b/ctdb/tests/eventscripts/60.ganesha.monitor.131.sh
index 95ce450e79f878a797b73f58e41778d61df474b9..429e60fbd4aa02ab03f6aeb2bf16dc532ff1fc0b 100755 (executable)
--- a/ctdb/tests/eventscripts/60.ganesha.monitor.131.sh
+++ b/ctdb/tests/eventscripts/60.ganesha.monitor.131.sh
@@ -7,11 +7,5 @@ define_test "rquotad down"
 setup_nfs_ganesha
 rpc_services_down "rquotad"
 
-ok<<EOF
-ERROR: rquotad failed RPC check:
-rpcinfo: RPC: Program not registered
-program rquotad version 1 is not available
-Trying to restart rquotad [rpc.rquotad]
-EOF
-
+rpc_set_service_failure_response "rquotad"
 simple_test

diff --git a/ctdb/tests/eventscripts/60.ganesha.monitor.141.sh b/ctdb/tests/eventscripts/60.ganesha.monitor.141.sh
index c9a5ab7658a96636cbe96073f382affb5ce2823c..24f7c384fead4219a30477ccea4b3ffd62538eef 100755 (executable)
--- a/ctdb/tests/eventscripts/60.ganesha.monitor.141.sh
+++ b/ctdb/tests/eventscripts/60.ganesha.monitor.141.sh
@@ -9,47 +9,4 @@ define_test "statd down, 10 iterations"
 setup_nfs_ganesha
 rpc_services_down "status"
 
-ok_null
-simple_test || exit $?
-
-ok<<EOF
-Trying to restart statd [rpc.statd]
-EOF
-simple_test || exit $?
-
-ok_null
-simple_test || exit $?
-
-ok<<EOF
-ERROR: status failed RPC check:
-rpcinfo: RPC: Program not registered
-program status version 1 is not available
-Trying to restart statd [rpc.statd]
-EOF
-simple_test || exit $?
-
-ok_null
-simple_test || exit $?
-
-required_result 1 <<EOF
-ERROR: status failed RPC check:
-rpcinfo: RPC: Program not registered
-program status version 1 is not available
-EOF
-simple_test || exit $?
-simple_test || exit $?
-simple_test || exit $?
-simple_test || exit $?
-
-CTDB_NFS_DUMP_STUCK_THREADS=3
-FAKE_RPC_THREAD_PIDS=1234
-
-required_result 1 <<EOF
-ERROR: status failed RPC check:
-rpcinfo: RPC: Program not registered
-program status version 1 is not available
-Trying to restart statd [rpc.statd]
-Stack trace for rpc.statd[1234]:
-[<ffffffff87654321>] fake_stack_trace_for_pid_1234/stack+0x0/0xff
-EOF
-simple_test || exit $?
+nfs_iterate_test 10 "status"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.144.sh b/ctdb/tests/eventscripts/60.nfs.monitor.144.sh
index 0a3beb7ca2c5db23793fb1e513b92da073a5b123..5f409173ca2e1bd30d6d496e3b6e73d44a070ccb 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.144.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.144.sh
@@ -9,47 +9,4 @@ define_test "statd down, 10 iterations"
 setup_nfs
 rpc_services_down "status"
 
-ok_null
-simple_test || exit $?
-
-ok<<EOF
-Trying to restart statd [rpc.statd]
-EOF
-simple_test || exit $?
-
-ok_null
-simple_test || exit $?
-
-ok<<EOF
-ERROR: status failed RPC check:
-rpcinfo: RPC: Program not registered
-program status version 1 is not available
-Trying to restart statd [rpc.statd]
-EOF
-simple_test || exit $?
-
-ok_null
-simple_test || exit $?
-
-required_result 1 <<EOF
-ERROR: status failed RPC check:
-rpcinfo: RPC: Program not registered
-program status version 1 is not available
-EOF
-simple_test || exit $?
-simple_test || exit $?
-simple_test || exit $?
-simple_test || exit $?
-
-CTDB_NFS_DUMP_STUCK_THREADS=3
-FAKE_RPC_THREAD_PIDS=1234
-
-required_result 1 <<EOF
-ERROR: status failed RPC check:
-rpcinfo: RPC: Program not registered
-program status version 1 is not available
-Trying to restart statd [rpc.statd]
-Stack trace for rpc.statd[1234]:
-[<ffffffff87654321>] fake_stack_trace_for_pid_1234/stack+0x0/0xff
-EOF
-simple_test || exit $?
+nfs_iterate_test 10 "status"