sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

ctdb-tests: Log to stderr in statd-callout tests

Browse Source 
Errors logged when testing statd-callout don't currently go anywhere.
This is because arguments to the hacked version of script_log() are
ignored.

Remove the hack and configure logging to stderr.

This could go in the local statd-callout.sh setup script.  However,
make it available for other script tests.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Wed Jul 19 09:57:37 UTC 2023 on atb-devel-224
This commit is contained in:
Martin Schwenke 2023-07-16 20:55:57 +10:00 committed by Amitay Isaacs
parent ef15a34d5d
commit 6e4c7ae9a2
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctdb/tests/UNIT/eventscripts/etc-ctdb/rc.local
View File

@ -51,9 +51,4 @@ background_with_logging ()
"$@" 2>&1 </dev/null | sed -e 's@^@\&@'
}
script_log ()
{
cat
}
CTDB_INIT_STYLE="${EVENTSCRIPT_TESTS_INIT_STYLE:-redhat}"

4
ctdb/tests/UNIT/eventscripts/scripts/local.sh
View File

@ -23,9 +23,7 @@ export CTDB="ctdb"
# Force this to be absolute - event scripts can change directory
CTDB_TEST_TMP_DIR=$(cd "$CTDB_TEST_TMP_DIR" && echo "$PWD")
export CTDB_LOGGING="file:${CTDB_TEST_TMP_DIR}/log.ctdb"
touch "${CTDB_LOGGING#file:}" ||
die "Unable to setup logging for \"$CTDB_LOGGING\""
export CTDB_LOGGING="file:"
if [ -d "${CTDB_TEST_SUITE_DIR}/etc" ]; then
cp -a "${CTDB_TEST_SUITE_DIR}/etc" "$CTDB_TEST_TMP_DIR"