system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #26499 from mrc0mmand/assorted-tweaks

Browse source 
A couple of test tweaks for recent CI fails
This commit is contained in:
Yu Watanabe 2023-02-21 05:55:37 +09:00 committed by GitHub
parent c87ff62210 85cce734c9
commit 53b3512f9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/TEST-78-SIGQUEUE/test.sh
View file

@ -3,6 +3,8 @@
set -e set -e
TEST_DESCRIPTION="Test queue signal logic" TEST_DESCRIPTION="Test queue signal logic"
# Ignore gcov complaints caused by DynamicUser=true
IGNORE_MISSING_COVERAGE=yes
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "$TEST_BASE_DIR/test-functions" . "$TEST_BASE_DIR/test-functions"

4
test/units/testsuite-74.firstboot.sh
View file

@ -143,6 +143,8 @@ diff <(awk -F: '/^root/ { print $2; }' /etc/shadow) <(awk -F: '/^root/ { print $
rm -fr "$ROOT" rm -fr "$ROOT"
mkdir -p "$ROOT/bin" mkdir -p "$ROOT/bin"
touch "$ROOT/bin/fooshell" "$ROOT/bin/barshell" touch "$ROOT/bin/fooshell" "$ROOT/bin/barshell"
# Temporarily disable pipefail to avoid `echo: write error: Broken pipe
set +o pipefail
# We can do only limited testing here, since it's all an interactive stuff, # We can do only limited testing here, since it's all an interactive stuff,
# so --prompt and --prompt-root-password are skipped on purpose # so --prompt and --prompt-root-password are skipped on purpose
echo -ne "\nfoo\nbar\n" | systemd-firstboot --root="$ROOT" --prompt-locale echo -ne "\nfoo\nbar\n" | systemd-firstboot --root="$ROOT" --prompt-locale
@ -168,6 +170,8 @@ grep -q "^root:.*:0:0:.*:/bin/fooshell$" "$ROOT/etc/passwd"
# Now without the welcome screen but with force # Now without the welcome screen but with force
echo -ne "/bin/barshell\n" | systemd-firstboot --root="$ROOT" --force --prompt-root-shell --welcome=no echo -ne "/bin/barshell\n" | systemd-firstboot --root="$ROOT" --force --prompt-root-shell --welcome=no
grep -q "^root:.*:0:0:.*:/bin/barshell$" "$ROOT/etc/passwd" grep -q "^root:.*:0:0:.*:/bin/barshell$" "$ROOT/etc/passwd"
# Re-enable pipefail
set -o pipefail
# Assorted tests # Assorted tests
rm -fr "$ROOT" rm -fr "$ROOT"