sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

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

Browse Source 
... instead of iterate_test()

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2015-06-17 17:12:25 +10:00 committed by Amitay Isaacs
parent e795429802
commit 5c7cd209cb
12 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tests/eventscripts/60.nfs.monitor.112.sh
View File

@ -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"

2
ctdb/tests/eventscripts/60.nfs.monitor.113.sh
View File

@ -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"

2
ctdb/tests/eventscripts/60.nfs.monitor.114.sh
View File

@ -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"

4
ctdb/tests/eventscripts/60.nfs.monitor.121.sh
View File

@ -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"

4
ctdb/tests/eventscripts/60.nfs.monitor.122.sh
View File

@ -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"

2
ctdb/tests/eventscripts/60.nfs.monitor.131.sh
View File

@ -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"

3
ctdb/tests/eventscripts/60.nfs.monitor.132.sh
View File

@ -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"'

5
ctdb/tests/eventscripts/60.nfs.monitor.141.sh
View File

@ -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"

3
ctdb/tests/eventscripts/60.nfs.monitor.142.sh
View File

@ -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"'

3
ctdb/tests/eventscripts/60.nfs.monitor.143.sh
View File

@ -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"

6
ctdb/tests/eventscripts/60.nfs.monitor.152.sh
View File

@ -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"

3
ctdb/tests/eventscripts/60.nfs.monitor.153.sh
View File

@ -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"