diff options
| author | Martin Schwenke <martin@meltin.net> | 2017-10-25 17:52:04 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-11-01 10:49:26 +0100 |
| commit | 020afdc685faf27941c4ba14fe532220db635acc (patch) | |
| tree | 12ae2a4465fb28176da85a927b3c75adc00cac2b /ctdb | |
| parent | 418c5c5cecd5b793d6213689350378c8c11dfcab (diff) | |
| download | samba-020afdc685faf27941c4ba14fe532220db635acc.tar.gz | |
ctdb-tests: Wait for fake_ctdbd to start, fail if it doesn't
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13097
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 6fad42103c0c812d5b5f4b42854fd7fd68846487)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tests/tool/scripts/local.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ctdb/tests/tool/scripts/local.sh b/ctdb/tests/tool/scripts/local.sh index 2c9be2d324c..7cee84a2d4b 100644 --- a/ctdb/tests/tool/scripts/local.sh +++ b/ctdb/tests/tool/scripts/local.sh @@ -48,10 +48,14 @@ cleanup_ctdbd () setup_ctdbd () { - debug "Setting up fake ctdbd" + echo "Setting up fake ctdbd" $VALGRIND fake_ctdbd -d "$FAKE_CTDBD_DEBUGLEVEL" \ -s "$ctdbd_socket" -p "$ctdbd_pidfile" + # Wait till fake_ctdbd is running + wait_until 10 test -S "$ctdbd_socket" || \ + die "fake_ctdbd failed to start" + test_cleanup cleanup_ctdbd } |