]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-tests: 60.nfs (and 06.nfs) event script setup modularisation
authorMartin Schwenke <martin@meltin.net>
Mon, 12 Feb 2018 19:53:44 +0000 (06:53 +1100)
committerAmitay Isaacs <amitay@samba.org>
Wed, 28 Mar 2018 00:57:19 +0000 (02:57 +0200)
Includes gratuitous changes to get lines below 80 columns.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
42 files changed:
ctdb/tests/eventscripts/06.nfs.releaseip.001.sh
ctdb/tests/eventscripts/06.nfs.releaseip.002.sh
ctdb/tests/eventscripts/06.nfs.takeip.001.sh
ctdb/tests/eventscripts/06.nfs.takeip.002.sh
ctdb/tests/eventscripts/60.nfs.monitor.001.sh
ctdb/tests/eventscripts/60.nfs.monitor.101.sh
ctdb/tests/eventscripts/60.nfs.monitor.102.sh
ctdb/tests/eventscripts/60.nfs.monitor.103.sh
ctdb/tests/eventscripts/60.nfs.monitor.104.sh
ctdb/tests/eventscripts/60.nfs.monitor.105.sh
ctdb/tests/eventscripts/60.nfs.monitor.106.sh
ctdb/tests/eventscripts/60.nfs.monitor.107.sh
ctdb/tests/eventscripts/60.nfs.monitor.108.sh
ctdb/tests/eventscripts/60.nfs.monitor.109.sh
ctdb/tests/eventscripts/60.nfs.monitor.111.sh
ctdb/tests/eventscripts/60.nfs.monitor.112.sh
ctdb/tests/eventscripts/60.nfs.monitor.113.sh
ctdb/tests/eventscripts/60.nfs.monitor.114.sh
ctdb/tests/eventscripts/60.nfs.monitor.121.sh
ctdb/tests/eventscripts/60.nfs.monitor.122.sh
ctdb/tests/eventscripts/60.nfs.monitor.131.sh
ctdb/tests/eventscripts/60.nfs.monitor.132.sh
ctdb/tests/eventscripts/60.nfs.monitor.141.sh
ctdb/tests/eventscripts/60.nfs.monitor.142.sh
ctdb/tests/eventscripts/60.nfs.monitor.143.sh
ctdb/tests/eventscripts/60.nfs.monitor.144.sh
ctdb/tests/eventscripts/60.nfs.monitor.151.sh
ctdb/tests/eventscripts/60.nfs.monitor.152.sh
ctdb/tests/eventscripts/60.nfs.monitor.153.sh
ctdb/tests/eventscripts/60.nfs.monitor.161.sh
ctdb/tests/eventscripts/60.nfs.monitor.162.sh
ctdb/tests/eventscripts/60.nfs.multi.001.sh
ctdb/tests/eventscripts/60.nfs.multi.002.sh
ctdb/tests/eventscripts/60.nfs.releaseip.001.sh
ctdb/tests/eventscripts/60.nfs.releaseip.002.sh
ctdb/tests/eventscripts/60.nfs.shutdown.001.sh
ctdb/tests/eventscripts/60.nfs.shutdown.002.sh
ctdb/tests/eventscripts/60.nfs.startup.001.sh
ctdb/tests/eventscripts/60.nfs.startup.002.sh
ctdb/tests/eventscripts/60.nfs.takeip.001.sh
ctdb/tests/eventscripts/60.nfs.takeip.002.sh
ctdb/tests/eventscripts/scripts/60.nfs.sh

index 8f590b01757fa443e619bda7a7a28f37d461ed4e..538eae787e8004d6a4ab188da403a172a1f4a8ca 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'true'"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="true"
+CTDB_NFS_CALLOUT="true"
 
 ok_null
 simple_test
index c0b893929b6fc657c941865e61df2acfac8dd868..884ca81a0b1da93c53518977f467ee5555113ecf 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'false', causes releaseip-pre to fail"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="echo releaseip-pre ; false"
+CTDB_NFS_CALLOUT="echo releaseip-pre ; false"
 
 required_result 1 "releaseip-pre"
 simple_test
index 8f590b01757fa443e619bda7a7a28f37d461ed4e..538eae787e8004d6a4ab188da403a172a1f4a8ca 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'true'"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="true"
+CTDB_NFS_CALLOUT="true"
 
 ok_null
 simple_test
index 1baf351265c7f1451f441e8956f1b40df85b52c9..895bf2d2ce2b69299efeb93db420fb8005b47bf7 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'false', causes takeip-pre to fail"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="echo takeip-pre ; false"
+CTDB_NFS_CALLOUT="echo takeip-pre ; false"
 
 required_result 1 "takeip-pre"
 simple_test
index c62e5cf87896c463ecb3f98705b6660d807090e6..00f8180901f98a972c5f8aa28fa3a813549fc1fa 100755 (executable)
@@ -4,7 +4,7 @@
 
 define_test "not managed, check no-op"
 
-setup_nfs "down"
+setup "down"
 
 ok_null
 
index 1a68927810696f131226368a191837cd27776fcd..293b724001e5c06e17b387a75da63889d8b20164 100755 (executable)
@@ -4,7 +4,7 @@
 
 define_test "all services available"
 
-setup_nfs
+setup
 
 ok_null
 
index 5bb72b65255fcae88bff2bebf10f4dac62f0010d..2f83b2ce9763633c0e55893077e7b4e7dc748f4d 100755 (executable)
@@ -4,7 +4,7 @@
 
 define_test "all services available, check nfsd thread count, count matches"
 
-setup_nfs
+setup
 
 RPCNFSDCOUNT=8
 nfs_setup_fake_threads "nfsd" 1 2 3 4 5 6 7 8
index cf2491d009ce44f5d16ae1f6afca673a7ef1cc38..c0bb305875a5eb8b39cf5393547968434b8a7ff9 100755 (executable)
@@ -2,9 +2,9 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-define_test "all services available, check nfsd thread count, not enough threads"
+define_test "all services available, not enough nfsd threads"
 
-setup_nfs
+setup
 
 RPCNFSDCOUNT=8
 nfs_setup_fake_threads "nfsd" 1 2 3 4 5
index ea3f66561a120f1b319fe1e8897b0ae79e8d1cac..d5688925629dbef4cf58f7f6dc6e7bda3a8014be 100755 (executable)
@@ -7,7 +7,7 @@
 # consciously removed.
 define_test "all services available, check nfsd thread count, too many threads"
 
-setup_nfs
+setup
 
 RPCNFSDCOUNT=4
 nfs_setup_fake_threads "nfsd" 1 2 3 4 5 6
index c0513e46764afd18223aeadfee55df774f66b2dd..e83ead84e3349b787f3f0f3a5bf162a8c9189a8f 100755 (executable)
@@ -4,7 +4,7 @@
 
 define_test "all services available, 10 iterations with ok_null"
 
-setup_nfs
+setup
 
 ok_null
 nfs_iterate_test 10
index 49329c33e36191ad55394425b3d0edb5cbe2ccf2..43d6b2f03ec87e06bba0b37c602cd805045fe6a0 100755 (executable)
@@ -4,7 +4,8 @@
 
 define_test "portmapper down, 2 iterations"
 
-setup_nfs
+setup
+
 rpc_services_down "portmapper"
 
 nfs_iterate_test 2 "portmapper"
index 8f590b01757fa443e619bda7a7a28f37d461ed4e..538eae787e8004d6a4ab188da403a172a1f4a8ca 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'true'"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="true"
+CTDB_NFS_CALLOUT="true"
 
 ok_null
 simple_test
index 6fe7bada1ccf3c93993e590f3fa212e79acde904..5ec9a0765d59f6953241959eb71213fca18b26d9 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'false', causes monitor-pre to fail"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="echo monitor-pre ; false"
+CTDB_NFS_CALLOUT="echo monitor-pre ; false"
 
 required_result 1 "monitor-pre"
 simple_test
index a86f6d99e1294c3df7375b02bd043eb3980d6f0c..2197ade6f9faa2899f381418d76f2ea67a60b89a 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'false', causes monitor-post to fail"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="echo monitor-post ; false"
+CTDB_NFS_CALLOUT="echo monitor-post ; false"
 
 required_result 1 "monitor-post"
 simple_test
index 414fcc8066b013a7fe2e283d306603d113dcbe1b..2bbda9686b7d2ae33524d317bf6439dfa20f0f6c 100755 (executable)
@@ -4,7 +4,8 @@
 
 define_test "knfsd down, 1 iteration"
 
-setup_nfs
+setup
+
 rpc_services_down "nfs"
 
 ok_null
index 7c7bbf5a35066211e1728df6f3c481b0a86008fc..4000b5d8435ded37dc28039ea6f512f19a63627b 100755 (executable)
@@ -6,7 +6,8 @@ define_test "knfsd down, 10 iterations"
 
 # knfsd fails and attempts to restart it fail.
 
-setup_nfs
+setup
+
 rpc_services_down "nfs"
 
 nfs_iterate_test 10 "nfs"
index 68ade385aea5fa7f45d7899b1542dfaca16f6086..744966c94c7fd59b71ff12d53d8a2b309a28f4d5 100755 (executable)
@@ -5,7 +5,8 @@
 define_test "knfsd down, 10 iterations, no hung threads"
 
 # knfsd fails and attempts to restart it fail.
-setup_nfs
+setup
+
 rpc_services_down "nfs"
 
 nfs_setup_fake_threads "nfsd"
index 94de41fb73f99915930a4804fece066dcdf893cf..7170fff64724602d02d472d47f7ef0ed074c0704 100755 (executable)
@@ -5,7 +5,8 @@
 define_test "knfsd down, 10 iterations, 3 hung threads"
 
 # knfsd fails and attempts to restart it fail.
-setup_nfs
+setup
+
 rpc_services_down "nfs"
 
 nfs_setup_fake_threads "nfsd" 1001 1002 1003
index de69498721a0d5908374a75c82591b70b1ba8a15..1cda2765c386df1d3c7eda20c3c050eb1b73a36d 100755 (executable)
@@ -8,7 +8,8 @@ define_test "lockd down, 7 iterations"
 # attempts to restart the service.  That is, the eventscript is unable
 # to restart the service.
 
-setup_nfs
+setup
+
 rpc_services_down "nlockmgr"
 
 nfs_iterate_test 7 "nlockmgr"
index a0e0656c412af988959b68a94c9fb1e99f52cbae..eae7ca0b42af940c9d784ee413b6b77d2b94c9fc 100755 (executable)
@@ -7,7 +7,8 @@ define_test "lockd down, 7 iterations, back up after 2"
 # This simulates a success the eventscript's automated attempts to
 # restart the service.
 
-setup_nfs
+setup
+
 rpc_services_down "nlockmgr"
 
 # Iteration 2 should try to restart rpc.lockd.  However, our test
index 72a1917f6f1b81c8e2d5fa350c1764eb3a4727da..33e1cf47499866bbe9ee229df0cd8615637b0908 100755 (executable)
@@ -4,7 +4,8 @@
 
 define_test "rquotad down, 7 iterations"
 
-setup_nfs
+setup
+
 rpc_services_down "rquotad"
 
 nfs_iterate_test 7 "rquotad"
index e34bb494b1a8c3a588a661d3b478405782a03d6f..207d872c24fc512f1b1a548db72d3b60ec93ea4d 100755 (executable)
@@ -7,7 +7,8 @@ define_test "rquotad down, 7 iterations, back up after 2"
 # rquotad fails once but then comes back after restart after 2nd
 # failure.
 
-setup_nfs
+setup
+
 rpc_services_down "rquotad"
 
 nfs_iterate_test 7 "rquotad" \
index 96159338a0e4e15ea3b5913afa7fdaa2d406abea..5a8c5ce75a791d08d35bdebe2d7c76174bd45b0a 100755 (executable)
@@ -6,7 +6,8 @@ define_test "statd down, 7 iterations"
 
 # statd fails and attempts to restart it fail.
 
-setup_nfs
+setup
+
 rpc_services_down "status"
 
 nfs_iterate_test 7 "status"
index ec88bdcff0b6883ae09973668f78ab0559bc8253..694bf928b7eead5cae6a3bd2d9a9978098944258 100755 (executable)
@@ -6,7 +6,8 @@ define_test "statd down, 7 iterations, back up after 2"
 
 # statd fails and the first attempt to restart it succeeds.
 
-setup_nfs
+setup
+
 rpc_services_down "status"
 
 nfs_iterate_test 7 "status" \
index 2e7f3cfce82d205e014d8b400bf0fa7f3a467c22..d17277ea88d6f9de9f703205777f7cf601dfe298 100755 (executable)
@@ -6,7 +6,8 @@ define_test "statd down, 2 iterations, stuck process"
 
 # statd fails and the first attempt to restart it succeeds.
 
-setup_nfs
+setup
+
 rpc_services_down "status"
 nfs_setup_fake_threads "rpc.status" 1001
 
index 96159338a0e4e15ea3b5913afa7fdaa2d406abea..5a8c5ce75a791d08d35bdebe2d7c76174bd45b0a 100755 (executable)
@@ -6,7 +6,8 @@ define_test "statd down, 7 iterations"
 
 # statd fails and attempts to restart it fail.
 
-setup_nfs
+setup
+
 rpc_services_down "status"
 
 nfs_iterate_test 7 "status"
index ea9aa7830ec410e98db6f3eee9dc53544d8976b0..9ab18072d4f9dacdbd022d05d91e75d73cf86a93 100755 (executable)
@@ -4,7 +4,8 @@
 
 define_test "mountd down, 1 iteration"
 
-setup_nfs
+setup
+
 rpc_services_down "mountd"
 
 ok_null
index 514369849d4cd631ce1b53d859435b6388b30a14..c3a6b8bbf305c004ece025a9ec9e09a987ffaf62 100755 (executable)
@@ -8,7 +8,8 @@ define_test "mountd down, 7 iterations"
 # attempts to restart the service.  That is, the eventscript is unable
 # to restart the service.
 
-setup_nfs
+setup
+
 rpc_services_down "mountd"
 
 nfs_iterate_test 7 "mountd"
index 5dce3c47c5d4feaafb91969dd6652135d7d41fe4..a09315bcac505c170e5747f917e767a3485ebcf0 100755 (executable)
@@ -4,7 +4,8 @@
 
 define_test "mountd down, 7 iterations, back up after 2"
 
-setup_nfs
+setup
+
 rpc_services_down "mountd"
 
 # Iteration 2 should try to restart rpc.mountd.  However, our test
index 11c4f78172e34a5c973e1474f7f31ffd01e8f564..ed080c2c4c839febaad8e7e1ae0a97a87175b2fe 100755 (executable)
@@ -4,7 +4,7 @@
 
 define_test "2nd share missing"
 
-setup_nfs
+setup
 
 out=$(shares_missing "ERROR: nfs directory \"%s\" not available" 2)
 
index 4a8be869e1db8cb99ab2073ccc0b6669df3950d3..51ce93e5267f2ce0443b5cacafef8041b4fbeaf1 100755 (executable)
@@ -4,8 +4,9 @@
 
 define_test "2nd share missing, skipping share checks"
 
-setup_nfs
-export CTDB_NFS_SKIP_SHARE_CHECK="yes"
+setup
+
+CTDB_NFS_SKIP_SHARE_CHECK="yes"
 
 ok_null
 
index f983df7615a381748a714b735c303a70c99e4969..baa57019e32be0c842b71314ad3d9b42637a5059 100755 (executable)
@@ -4,7 +4,7 @@
 
 define_test "takeip, ipreallocated -> reconfigure"
 
-setup_nfs
+setup
 
 public_address=$(ctdb_get_1_public_address)
 
index 29386c13b23ae39c2796b2a2cb76e22ab37d618b..846380f92b15268c73822489d2bed5fe740bbc24 100755 (executable)
@@ -4,7 +4,7 @@
 
 define_test "takeip, monitor -> no reconfigure"
 
-setup_nfs
+setup
 
 public_address=$(ctdb_get_1_public_address)
 
index 8f590b01757fa443e619bda7a7a28f37d461ed4e..538eae787e8004d6a4ab188da403a172a1f4a8ca 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'true'"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="true"
+CTDB_NFS_CALLOUT="true"
 
 ok_null
 simple_test
index 68f636f489f206ce628161d802ae55850505d235..752070c24526740d5d1d8afd03895af01034f66f 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'false', causes releaseip to fail"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="echo releaseip ; false"
+CTDB_NFS_CALLOUT="echo releaseip ; false"
 
 required_result 1 "releaseip"
 simple_test
index 8f590b01757fa443e619bda7a7a28f37d461ed4e..538eae787e8004d6a4ab188da403a172a1f4a8ca 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'true'"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="true"
+CTDB_NFS_CALLOUT="true"
 
 ok_null
 simple_test
index b8bb5606b27cb8c14985dd88c48f15d651e93ccc..9ddf9d878251f514270ebe2bf49e5bd9fdecb1f4 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'false', causes shutdown to fail"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="echo shutdown ; false"
+CTDB_NFS_CALLOUT="echo shutdown ; false"
 
 required_result 1 "shutdown"
 simple_test
index 8f590b01757fa443e619bda7a7a28f37d461ed4e..538eae787e8004d6a4ab188da403a172a1f4a8ca 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'true'"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="true"
+CTDB_NFS_CALLOUT="true"
 
 ok_null
 simple_test
index e020c9dd6696c2c1ebf82d442ad8fec094856e5b..d431ea425b95f9532660f531fdd6860307b81ea5 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'false', causes startup to fail"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="echo startup ; false"
+CTDB_NFS_CALLOUT="echo startup ; false"
 
 required_result 1 "startup"
 simple_test
index 8f590b01757fa443e619bda7a7a28f37d461ed4e..538eae787e8004d6a4ab188da403a172a1f4a8ca 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'true'"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="true"
+CTDB_NFS_CALLOUT="true"
 
 ok_null
 simple_test
index 4fc3f7270ee10c4cae86dc2deb47a0c924fe74b8..5f4f19762c97f6f1bf6bef47682426b9606ee1de 100755 (executable)
@@ -4,9 +4,9 @@
 
 define_test "callout is 'false', causes takeip to fail"
 
-setup_nfs
+setup
 
-export CTDB_NFS_CALLOUT="echo takeip ; false"
+CTDB_NFS_CALLOUT="echo takeip ; false"
 
 required_result 1 "takeip"
 simple_test
index b91a5d96a68620654670fcbd7f9a6b4b467206ee..efc5810218aee8c005419bab1769db554879ea9d 100644 (file)
@@ -1,6 +1,6 @@
-setup_nfs ()
+setup ()
 {
-       setup_ctdb
+       setup_shares
 
        service_name="nfs"
 
@@ -13,11 +13,10 @@ setup_nfs ()
        # This doesn't even need to exist
        export CTDB_NFS_EXPORTS_FILE="$EVENTSCRIPTS_TESTS_VAR_DIR/etc-exports"
 
-       # Reset the failcounts for nfs services.
-       eventscript_call eval rm -f '$ctdb_fail_dir/nfs_*'
-
        if [ "$1" != "down" ] ; then
-               debug "Setting up NFS environment: all RPC services up, NFS managed by CTDB"
+               debug <<EOF
+Setting up NFS environment: all RPC services up, NFS managed by CTDB
+EOF
 
                service "nfs" force-started
                service "nfslock" force-started
@@ -29,9 +28,11 @@ setup_nfs ()
                        "nlockmgr" "status"
 
                nfs_setup_fake_threads "nfsd"
-               nfs_setup_fake_threads "rpc.foobar"  # Just set the variable to empty
+               nfs_setup_fake_threads "rpc.foobar"  # Set the variable to empty
        else
-               debug "Setting up NFS environment: all RPC services down, NFS not managed by CTDB"
+               debug <<EOF
+Setting up NFS environment: all RPC services down, NFS not managed by CTDB
+EOF
 
                service "nfs" force-stopped
                service "nfslock" force-stopped
@@ -39,6 +40,8 @@ setup_nfs ()
                export CTDB_MANAGES_NFS=""
        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
@@ -49,14 +52,22 @@ setup_nfs ()
 
 rpc_services_down ()
 {
-       for _i ; do
-           debug "Marking RPC service \"${_i}\" as unavailable"
-           FAKE_RPCINFO_SERVICES=$(echo "$FAKE_RPCINFO_SERVICES" | sed -r -e "s@[[:space:]]*${_i}:[0-9]+:[0-9]+@@g")
+       _out=""
+       for _s in $FAKE_RPCINFO_SERVICES ; do
+               for _i ; do
+                       if [ "$_i" = "${_s%%:*}" ] ; then
+                           debug "Marking RPC service \"${_i}\" as UNAVAILABLE"
+                           continue 2
+                       fi
+               done
+               _out="${_out}${_out:+ }${_s}"
        done
+       FAKE_RPCINFO_SERVICES="$_out"
 }
 
 rpc_services_up ()
 {
+       _out="$FAKE_RPCINFO_SERVICES"
        for _i ; do
                debug "Marking RPC service \"${_i}\" as available"
                case "$_i" in
@@ -69,8 +80,9 @@ rpc_services_up ()
                *) die "Internal error - unsupported RPC service \"${_i}\"" ;;
                esac
 
-               FAKE_RPCINFO_SERVICES="${FAKE_RPCINFO_SERVICES}${FAKE_RPCINFO_SERVICES:+ }${_i}:${_t}"
+               _out="${_out}${_out:+ }${_i}:${_t}"
        done
+       export FAKE_RPCINFO_SERVICES="$_out"
 }
 
 nfs_setup_fake_threads ()
@@ -79,7 +91,7 @@ nfs_setup_fake_threads ()
 
        case "$_prog" in
        nfsd)
-               export PROCFS_PATH=$(mktemp -d --tmpdir="$EVENTSCRIPTS_TESTS_VAR_DIR")
+               export PROCFS_PATH="${EVENTSCRIPTS_TESTS_VAR_DIR}/proc"
                _threads="${PROCFS_PATH}/fs/nfsd/threads"
                mkdir -p $(dirname "$_threads")
                echo $# >"$_threads"
@@ -136,10 +148,12 @@ rpc_set_service_failure_response ()
        _dir="${CTDB_NFS_CHECKS_DIR:-${CTDB_BASE}/nfs-checks.d}"
 
        _file=$(ls "$_dir"/[0-9][0-9]."${_rpc_service}.check")
-       [ -r "$_file" ] || die "RPC check file \"$_file\" does not exist or is not unique"
+       [ -r "$_file" ] || \
+               die "RPC check file \"$_file\" does not exist or is not unique"
 
-       _out=$(mktemp --tmpdir="$EVENTSCRIPTS_TESTS_VAR_DIR")
-       _rc_file=$(mktemp --tmpdir="$EVENTSCRIPTS_TESTS_VAR_DIR")
+       _out="${EVENTSCRIPTS_TESTS_VAR_DIR}/rpc_failure_output"
+       : >"$_out"
+       _rc_file="${EVENTSCRIPTS_TESTS_VAR_DIR}/rpc_result"
 
        (
                # Subshell to restrict scope variables...
@@ -173,7 +187,8 @@ $_rpc_service failed RPC check:
 rpcinfo: RPC: Program not registered
 program $_rpc_service${_ver:+ version }${_ver} is not available"
 
-               if [ $unhealthy_after -gt 0 -a $_numfails -ge $unhealthy_after ] ; then
+               if [ $unhealthy_after -gt 0 -a \
+                    $_numfails -ge $unhealthy_after ] ; then
                        _unhealthy=true
                        echo 1 >"$_rc_file"
                        echo "ERROR: ${_rpc_check_out}" >>"$_out"
@@ -188,7 +203,8 @@ program $_rpc_service${_ver:+ version }${_ver} is not available"
                                echo "WARNING: ${_rpc_check_out}" >>"$_out"
                        fi
 
-                       echo "Trying to restart service \"${_rpc_service}\"..." >>"$_out"
+                       echo "Trying to restart service \"${_rpc_service}\"..."\
+                            >>"$_out"
 
                        if [ -n "$service_debug_cmd" ] ; then
                                $service_debug_cmd 2>&1 >>"$_out"
@@ -258,9 +274,13 @@ nfs_iterate_test ()
                # This is not a numerical comparison because $1 will
                # often not be set.
                if [ "$_iteration" = "$1" ] ; then
-                       debug "##################################################"
+                       debug <<EOF
+##################################################
+EOF
                        eval "$2"
-                       debug "##################################################"
+                       debug <<EOF
+##################################################
+EOF
                        shift 2
                fi
                if [ -n "$_rpc_service" ] ; then
@@ -270,7 +290,8 @@ nfs_iterate_test ()
                                        _ok=true
                                fi
                        else
-                               if rpcinfo -T tcp localhost "$_rpc_service" >/dev/null 2>&1 ; then
+                               if rpcinfo -T tcp localhost "$_rpc_service" \
+                                          >/dev/null 2>&1 ; then
                                        _ok=true
                                fi
                        fi
@@ -280,14 +301,17 @@ nfs_iterate_test ()
                        else
                                _iterate_failcount=$(($_iterate_failcount + 1))
                        fi
-                       rpc_set_service_failure_response "$_rpc_service" $_iterate_failcount
+                       rpc_set_service_failure_response \
+                               "$_rpc_service" $_iterate_failcount
                fi
                _out=$(simple_test 2>&1)
                _ret=$?
                if "$TEST_VERBOSE" || [ $_ret -ne 0 ] ; then
-                       echo "##################################################"
-                       echo "Iteration ${_iteration}:"
-                       echo "$_out"
+                       cat <<EOF
+##################################################
+Iteration ${_iteration}:
+$_out
+EOF
                fi
                if [ $_ret -ne 0 ] ; then
                        exit $_ret