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 <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh
index e83ead84e3349b787f3f0f3a5bf162a8c9189a8f..79aeac1e36c41098dfc2887accdf55ac8efcbf27 100755 (executable)
--- 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 2bbda9686b7d2ae33524d317bf6439dfa20f0f6c..f398b543f1537c9ffb6a2eb3f28ee646b14a155b 100755 (executable)
--- 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 9ab18072d4f9dacdbd022d05d91e75d73cf86a93..8622622066383eb652a4303477b7df8db084f66e 100755 (executable)
--- 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"