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

ctdb-tests: Force stub version of service in eventscript tests

Browse Source 
Fedora 34 now has a shell function for the which command, which causes
these uses of which to return the enclosing function definition rather
than the executable file as expected.

The event script unit tests always expect the stub service command to
be used, so the conditional in these functions is unnecessary.
$CTDB_HELPER_BINDIR already conveniently points to the stub directory,
so use it here.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2021-06-21 15:26:38 +10:00 committed by Amitay Isaacs
parent 23b2fab2c8
commit fc0da6b0f8
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,14 @@
# Hey Emacs, this is a -*- shell-script -*- !!! :-)
# Use a "service" command in $PATH if one exists.
# Always use stub version of service command
service ()
{
if _t=$(which "service" 2>/dev/null) ; then
"$_t" "$@"
else
_nice=""
_service "$@"
fi
"${CTDB_HELPER_BINDIR}/service" "$@"
}
nice_service ()
{
if _t=$(which "service" 2>/dev/null) ; then
nice "$_t" "$@"
else
_nice="nice"
_service "$@"
fi
nice "${CTDB_HELPER_BINDIR}/service" "$@"
}
# Always succeeds