diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-07-08 15:01:11 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-07-09 09:27:02 +0200 |
| commit | 7a9eddd3b11959e202bc21e5cc8998131d625280 (patch) | |
| tree | 331645fe9a647a8cdec680fa79fec5f94b68f578 /ctdb | |
| parent | 0a65013b9d86c496dcee0af1ad38cdd455a7004e (diff) | |
| download | samba-7a9eddd3b11959e202bc21e5cc8998131d625280.tar.gz | |
ctdb-tests: Remove statd-callout when running NFS tests
60.nfs backgrounds it so it persists in the background causing
problems. In particular, it causes the "ctdb ip" command stub to be
run in parallel, which produces inconstent results.
Better not to run it at all in the NFS tests.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Jul 9 09:27:02 CEST 2015 on sn-devel-104
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index ae313a75607..60483231a1f 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -814,6 +814,13 @@ setup_nfs () export CTDB_MANAGED_SERVICES="foo bar" unset CTDB_MANAGES_NFS fi + + # 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 horrible + # things with the "ctdb ip" stub and cause the actual + # statd-callout tests that follow to fail. + rm "${CTDB_BASE}/statd-callout" } setup_nfs_ganesha () |