sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

ctdb-tests: Use setup_script_options() in 60.nfs (and 06.nfs) tests

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-03-22 12:05:10 +11:00 committed by Amitay Isaacs
parent 96ed6c34ba
commit a48bd34246
17 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tests/eventscripts/06.nfs.releaseip.001.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'true'"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="true"
EOF
ok_null
simple_test

2
ctdb/tests/eventscripts/06.nfs.releaseip.002.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'false', causes releaseip-pre to fail"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="echo releaseip-pre ; false"
EOF
required_result 1 "releaseip-pre"
simple_test

2
ctdb/tests/eventscripts/06.nfs.takeip.001.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'true'"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="true"
EOF
ok_null
simple_test

2
ctdb/tests/eventscripts/06.nfs.takeip.002.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'false', causes takeip-pre to fail"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="echo takeip-pre ; false"
EOF
required_result 1 "takeip-pre"
simple_test

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

@ -6,7 +6,9 @@ define_test "callout is 'true'"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="true"
EOF
ok_null
simple_test

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

@ -6,7 +6,9 @@ define_test "callout is 'false', causes monitor-pre to fail"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="echo monitor-pre ; false"
EOF
required_result 1 "monitor-pre"
simple_test

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

@ -6,7 +6,9 @@ define_test "callout is 'false', causes monitor-post to fail"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="echo monitor-post ; false"
EOF
required_result 1 "monitor-post"
simple_test

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

@ -6,7 +6,9 @@ define_test "2nd share missing, skipping share checks"
setup
setup_script_options <<EOF
CTDB_NFS_SKIP_SHARE_CHECK="yes"
EOF
ok_null

2
ctdb/tests/eventscripts/60.nfs.releaseip.001.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'true'"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="true"
EOF
ok_null
simple_test

2
ctdb/tests/eventscripts/60.nfs.releaseip.002.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'false', causes releaseip to fail"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="echo releaseip ; false"
EOF
required_result 1 "releaseip"
simple_test

2
ctdb/tests/eventscripts/60.nfs.shutdown.001.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'true'"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="true"
EOF
ok_null
simple_test

2
ctdb/tests/eventscripts/60.nfs.shutdown.002.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'false', causes shutdown to fail"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="echo shutdown ; false"
EOF
required_result 1 "shutdown"
simple_test

2
ctdb/tests/eventscripts/60.nfs.startup.001.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'true'"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="true"
EOF
ok_null
simple_test

2
ctdb/tests/eventscripts/60.nfs.startup.002.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'false', causes startup to fail"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="echo startup ; false"
EOF
required_result 1 "startup"
simple_test

2
ctdb/tests/eventscripts/60.nfs.takeip.001.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'true'"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="true"
EOF
ok_null
simple_test

2
ctdb/tests/eventscripts/60.nfs.takeip.002.sh
View File

@ -6,7 +6,9 @@ define_test "callout is 'false', causes takeip to fail"
setup
setup_script_options <<EOF
CTDB_NFS_CALLOUT="echo takeip ; false"
EOF
required_result 1 "takeip"
simple_test

19
ctdb/tests/eventscripts/scripts/60.nfs.sh
View File

@ -6,13 +6,14 @@ setup ()
export FAKE_RPCINFO_SERVICES=""
export CTDB_NFS_SKIP_SHARE_CHECK="no"
setup_script_options <<EOF
CTDB_NFS_SKIP_SHARE_CHECK="no"
# This doesn't even need to exist
CTDB_NFS_EXPORTS_FILE="$EVENTSCRIPTS_TESTS_VAR_DIR/etc-exports"
EOF
export RPCNFSDCOUNT
# This doesn't even need to exist
export CTDB_NFS_EXPORTS_FILE="$EVENTSCRIPTS_TESTS_VAR_DIR/etc-exports"
if [ "$1" != "down" ] ; then
debug <<EOF
Setting up NFS environment: all RPC services up, NFS managed by CTDB
@ -21,7 +22,9 @@ EOF
service "nfs" force-started
service "nfslock" force-started
export CTDB_MANAGES_NFS="yes"
setup_script_options <<EOF
CTDB_MANAGES_NFS="yes"
EOF
rpc_services_up \
"portmapper" "nfs" "mountd" "rquotad" \
@ -37,11 +40,11 @@ EOF
service "nfs" force-stopped
service "nfslock" force-stopped
export CTDB_MANAGES_NFS=""
setup_script_options <<EOF
CTDB_MANAGES_NFS=""
EOF
fi
export CTDB_NFS_CALLOUT=""
# This is really nasty. However, when we test NFS we don't
# actually test statd-callout. If we leave it there then left
# over, backgrounded instances of statd-callout will do