tests: Require OSTREE_TEST_SUDO to be set to use sudo
IMO, tools invoking `sudo` automatically is a huge anti-pattern. Require this to be opt-in. In practice also...these tests really want to be *integration* and not unit tests because involving `sudo` alongside uninstalled binaries just creates a giant mess. Closes: https://github.com/ostreedev/ostree/issues/2761
This commit is contained in:
1 parent
8c831311be
commit
647f7fb7f1
3 files changed
+9
No files matched your search
@@ -614,6 +614,12 @@ skip_without_user_xattrs () {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
skip_without_sudo () {
|
||||||
|
if test -z "${OSTREE_TEST_SUDO:-}"; then
|
||||||
|
skip "this test needs sudo, skipping without OSTREE_TEST_SUDO being set"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Usage: if ! skip_one_without_whiteouts_devices; then ... more tests ...; fi
|
# Usage: if ! skip_one_without_whiteouts_devices; then ... more tests ...; fi
|
||||||
skip_one_without_whiteouts_devices() {
|
skip_one_without_whiteouts_devices() {
|
||||||
if ! can_create_whiteout_devices; then
|
if ! can_create_whiteout_devices; then
|
||||||
|
|||||||
@@ -9,7 +9,9 @@ set -euo pipefail
|
|||||||
mode="bare-split-xattrs"
|
mode="bare-split-xattrs"
|
||||||
OSTREE="${CMD_PREFIX} ostree --repo=${test_tmpdir}/repo"
|
OSTREE="${CMD_PREFIX} ostree --repo=${test_tmpdir}/repo"
|
||||||
|
|
||||||
|
skip_without_sudo
|
||||||
SUDO="sudo --non-interactive"
|
SUDO="sudo --non-interactive"
|
||||||
|
|
||||||
PRIVILEGED="false"
|
PRIVILEGED="false"
|
||||||
if [ $(id -u) -eq 0 ]; then
|
if [ $(id -u) -eq 0 ]; then
|
||||||
PRIVILEGED="true"
|
PRIVILEGED="true"
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ set -euo pipefail
|
|||||||
|
|
||||||
. $(dirname $0)/libtest.sh
|
. $(dirname $0)/libtest.sh
|
||||||
|
|
||||||
|
skip_without_sudo
|
||||||
SUDO="sudo --non-interactive"
|
SUDO="sudo --non-interactive"
|
||||||
|
|
||||||
# Skip the test if a well-known USB stick is not available.
|
# Skip the test if a well-known USB stick is not available.
|
||||||
|
|||||||
Reference in new issue
Block a user