ctdb-tests: Update NFS tests to use nfs_iterate_test()

... instead of iterate_test()

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

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.112.sh b/ctdb/tests/eventscripts/60.nfs.monitor.112.sh
index e843132e7dc9703f84ccb3491dcb4e5dc6e519b4..7c7bbf5a35066211e1728df6f3c481b0a86008fc 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.112.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.112.sh
@@ -9,4 +9,4 @@ define_test "knfsd down, 10 iterations"
 setup_nfs
 rpc_services_down "nfs"
 
-iterate_test 10 'rpc_set_service_failure_response "nfs"'
+nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.113.sh b/ctdb/tests/eventscripts/60.nfs.monitor.113.sh
index 017e7be0b6893a8917db7f129f69bc1ee12fb839..711d5a9a1f87ec36329ed0bc5edbb9296d598d48 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.113.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.113.sh
@@ -12,4 +12,4 @@ rpc_services_down "nfs"
 CTDB_NFS_DUMP_STUCK_THREADS=5
 FAKE_NFSD_THREAD_PIDS=""
 
-iterate_test 10 'rpc_set_service_failure_response "nfs"'
+nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.114.sh b/ctdb/tests/eventscripts/60.nfs.monitor.114.sh
index 9429e3ba297284ede47d8b9d45c9209145d32ab1..55fe66d041bb38bdc2ccb441feb0c61983847275 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.114.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.114.sh
@@ -12,4 +12,4 @@ rpc_services_down "nfs"
 CTDB_NFS_DUMP_STUCK_THREADS=5
 FAKE_NFSD_THREAD_PIDS="1001 1002 1003"
 
-iterate_test 10 'rpc_set_service_failure_response "nfs"'
+nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.121.sh b/ctdb/tests/eventscripts/60.nfs.monitor.121.sh
index 448b51d88419d8684347d24084aa12682dec8cca..cb8f0b28a66699cbd1eff62eb3e557bc7b0d8852 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.121.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.121.sh
@@ -11,6 +11,4 @@ define_test "lockd down, 15 iterations"
 setup_nfs
 rpc_services_down "nlockmgr"
 
-iterate_test 15 "ok_null" \
-    10 "rpc_set_service_failure_response 'nlockmgr'" \
-    15 "rpc_set_service_failure_response 'nlockmgr'"
+nfs_iterate_test 15 "nlockmgr"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.122.sh b/ctdb/tests/eventscripts/60.nfs.monitor.122.sh
index 38c8d1efd33adeaf60976967dca9956a7ff12bf8..cd67b443c37f6d5b03747853c25b8e43d53fc243 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.122.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.122.sh
@@ -13,7 +13,5 @@ rpc_services_down "nlockmgr"
 # Iteration 10 should try to restart rpc.lockd.  However, our test
 # stub rpc.lockd does nothing, so we have to explicitly flag it as up.
 
-iterate_test 15 "ok_null" \
-    10 "rpc_set_service_failure_response 'nlockmgr'" \
+nfs_iterate_test 15 "nlockmgr" \
     11 "rpc_services_up nlockmgr"
-

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.131.sh b/ctdb/tests/eventscripts/60.nfs.monitor.131.sh
index 1cf72a92844c81d90953cfced04af451169f50fe..09fd1e5907c959c3fcb71024bdbed17f842f57a8 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.131.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.131.sh
@@ -7,4 +7,4 @@ define_test "rquotad down, 5 iterations"
 setup_nfs
 rpc_services_down "rquotad"
 
-iterate_test 5 'rpc_set_service_failure_response "rquotad"'
+nfs_iterate_test 5 "rquotad"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.132.sh b/ctdb/tests/eventscripts/60.nfs.monitor.132.sh
index b8f3f2b0411cf985cf5459c197218c7fe7f25aa8..8f06ed2c13efb774c54ccf6824b329e6ca79d6b1 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.132.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.132.sh
@@ -10,6 +10,5 @@ define_test "rquotad down, 5 iterations, back up after 1"
 setup_nfs
 rpc_services_down "rquotad"
 
-iterate_test 5 'ok_null' \
-    1 'rpc_set_service_failure_response "rquotad"' \
+nfs_iterate_test 5 "rquotad" \
     2 'rpc_services_up "rquotad"'

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.141.sh b/ctdb/tests/eventscripts/60.nfs.monitor.141.sh
index 448495c450f7eb7ede4486338d59ae69a3bb6b4d..56690a9140ad2d2df296220b752b35ea31ccf51f 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.141.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.141.sh
@@ -9,7 +9,4 @@ define_test "statd down, 6 iterations"
 setup_nfs
 rpc_services_down "status"
 
-iterate_test 6 'ok_null' \
-    2 'rpc_set_service_failure_response "status"' \
-    4 'rpc_set_service_failure_response "status"' \
-    6 'rpc_set_service_failure_response "status"'
+nfs_iterate_test 6 "status"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.142.sh b/ctdb/tests/eventscripts/60.nfs.monitor.142.sh
index d7d9fd3ddd76738aab9950e1e11ad53e780383bb..3ed1c895e0ed234378918aaa1c28229df4245f8d 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.142.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.142.sh
@@ -9,6 +9,5 @@ define_test "statd down, 8 iterations, back up after 2"
 setup_nfs
 rpc_services_down "status"
 
-iterate_test 8 'ok_null' \
-    2 'rpc_set_service_failure_response "status"' \
+nfs_iterate_test 8 "status" \
     3 'rpc_services_up "status"'

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.143.sh b/ctdb/tests/eventscripts/60.nfs.monitor.143.sh
index 309877ca1e4316a2bc267776b66e6e20ebb349bc..4ed0dcf474ac3de0e75d153d0d2c8cdb189ae37e 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.143.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.143.sh
@@ -11,5 +11,4 @@ rpc_services_down "status"
 CTDB_NFS_DUMP_STUCK_THREADS=2
 FAKE_RPC_THREAD_PIDS="1001"
 
-iterate_test 2 'ok_null' \
-    2 'rpc_set_service_failure_response "status"'
+nfs_iterate_test 2 "status"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.152.sh b/ctdb/tests/eventscripts/60.nfs.monitor.152.sh
index c4eb4194ae2bb8c5cd76ef2ef59b142333988745..9ba2f1b6b11f00b4d491a6605c435658337cdd6f 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.152.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.152.sh
@@ -11,8 +11,4 @@ define_test "mountd down, 10 iterations"
 setup_nfs
 rpc_services_down "mountd"
 
-iterate_test 10 "ok_null" \
-    5 "rpc_set_service_failure_response 'mountd'" \
-    10 "rpc_set_service_failure_response 'mountd'"
-
-#export FAKE_NETSTAT_TCP_ESTABLISHED="10.0.0.1:2049|10.254.254.1:12301 10.0.0.1:2049|10.254.254.1:12302 10.0.0.1:2049|10.254.254.1:12303 10.0.0.1:2049|10.254.254.2:12304 10.0.0.1:2049|10.254.254.2:12305"
+nfs_iterate_test 10 "mountd"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.153.sh b/ctdb/tests/eventscripts/60.nfs.monitor.153.sh
index cf33e39bbc82f90c1b2c4b343aa5e30ed8ffaa9f..6da10bfde19ef5aa57ae0ddb2441e6a0cf5d6033 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.153.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.153.sh
@@ -10,6 +10,5 @@ rpc_services_down "mountd"
 # Iteration 5 should try to restart rpc.mountd.  However, our test
 # stub rpc.mountd does nothing, so we have to explicitly flag it as
 # up.
-iterate_test 10 "ok_null" \
-    5 "rpc_set_service_failure_response 'mountd'" \
+nfs_iterate_test 10 "mountd" \
     6 "rpc_services_up mountd"