From 0919701a68b8da41261ab2a88797d59f55ff7f2a Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 4 Jul 2024 11:10:59 +1000 Subject: [PATCH] ctdb-tests: Make NFS RPC monitoring tests consistent Update the remaining RPC monitoring tests to use nfs_iterate_test(), depending on it to set results. This makes all RPC monitoring tests consistent, so they will all benefit from future improvements. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh | 1 - ctdb/tests/UNIT/eventscripts/60.nfs.monitor.111.sh | 6 +----- ctdb/tests/UNIT/eventscripts/60.nfs.monitor.151.sh | 6 +----- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh index e83ead84e33..79aeac1e36c 100755 --- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh +++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh @@ -6,5 +6,4 @@ define_test "all services available, 10 iterations with ok_null" setup -ok_null nfs_iterate_test 10 diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.111.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.111.sh index 2bbda9686b7..f398b543f15 100755 --- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.111.sh +++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.111.sh @@ -6,8 +6,4 @@ define_test "knfsd down, 1 iteration" setup -rpc_services_down "nfs" - -ok_null - -simple_test +nfs_iterate_test 1 "nfs" diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.151.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.151.sh index 9ab18072d4f..86226220663 100755 --- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.151.sh +++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.151.sh @@ -6,8 +6,4 @@ define_test "mountd down, 1 iteration" setup -rpc_services_down "mountd" - -ok_null - -simple_test +nfs_iterate_test 1 "mountd" -- 2.47.3