-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(cherry picked from commit 1c36b4a) (cherry picked from commit e974b99) (cherry picked from commit d87be62) Related: #1798161 Conflicts: test/test-functions
- Loading branch information
1 parent
3628ba6
commit 802986e
Showing
4 changed files
with
96 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../TEST-01-BASIC/Makefile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
#!/bin/bash | ||
|
||
set -x | ||
set -e | ||
set -o pipefail | ||
|
||
# Test stdout stream | ||
|
||
# Skip empty lines | ||
ID=$(journalctl --new-id128 | sed -n 2p) | ||
>/expected | ||
printf $'\n\n\n' | systemd-cat -t "$ID" --level-prefix false | ||
journalctl --flush | ||
journalctl -b -o cat -t "$ID" >/output | ||
cmp /expected /output | ||
|
||
touch /testok | ||
exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
#!/bin/bash | ||
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- | ||
# ex: ts=8 sw=4 sts=4 et filetype=sh | ||
TEST_DESCRIPTION="Journal-related tests" | ||
|
||
. $TEST_BASE_DIR/test-functions | ||
|
||
check_result_qemu() { | ||
ret=1 | ||
mkdir -p $TESTDIR/root | ||
mount ${LOOPDEV}p1 $TESTDIR/root | ||
[[ -e $TESTDIR/root/testok ]] && ret=0 | ||
[[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR | ||
cp -a $TESTDIR/root/var/log/journal $TESTDIR | ||
umount $TESTDIR/root | ||
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed | ||
ls -l $TESTDIR/journal/*/*.journal | ||
test -s $TESTDIR/failed && ret=$(($ret+1)) | ||
return $ret | ||
} | ||
|
||
test_run() { | ||
if run_qemu; then | ||
check_result_qemu || return 1 | ||
else | ||
dwarn "can't run QEMU, skipping" | ||
fi | ||
if check_nspawn; then | ||
run_nspawn | ||
check_result_nspawn || return 1 | ||
else | ||
dwarn "can't run systemd-nspawn, skipping" | ||
fi | ||
return 0 | ||
} | ||
|
||
test_setup() { | ||
create_empty_image | ||
mkdir -p $TESTDIR/root | ||
mount ${LOOPDEV}p1 $TESTDIR/root | ||
|
||
# Create what will eventually be our root filesystem onto an overlay | ||
( | ||
LOG_LEVEL=5 | ||
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) | ||
|
||
setup_basic_environment | ||
|
||
# setup the testsuite service | ||
cat >$initdir/etc/systemd/system/testsuite.service <<EOF | ||
[Unit] | ||
Description=Testsuite service | ||
After=multi-user.target | ||
[Service] | ||
ExecStart=/test-journal.sh | ||
Type=oneshot | ||
EOF | ||
|
||
cp test-journal.sh $initdir/ | ||
|
||
setup_testsuite | ||
) | ||
setup_nspawn_root | ||
|
||
ddebug "umount $TESTDIR/root" | ||
umount $TESTDIR/root | ||
} | ||
|
||
test_cleanup() { | ||
umount $TESTDIR/root 2>/dev/null | ||
[[ $LOOPDEV ]] && losetup -d $LOOPDEV | ||
return 0 | ||
} | ||
|
||
do_test "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters