picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10136 from yuwata/run-unit-tests 

test: run unit tests under containers
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-10-09 15:33:49 +02:00 committed by GitHub
parent dd76367d3b 3f6f58e03a
commit 4c187c5258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 177 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/TEST-17-UDEV-WANTS/Makefile
View File

@ -1,4 +0,0 @@
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

1
test/TEST-17-UDEV-WANTS/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

4
test/TEST-18-FAILUREACTION/Makefile
View File

@ -1,4 +0,0 @@
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

1
test/TEST-18-FAILUREACTION/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

4
test/TEST-19-DELEGATE/Makefile
View File

@ -1,4 +0,0 @@
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

1
test/TEST-19-DELEGATE/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

4
test/TEST-20-MAINPIDGAMES/Makefile
View File

@ -1,4 +0,0 @@
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

1
test/TEST-20-MAINPIDGAMES/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

4
test/TEST-21-SYSUSERS/Makefile
View File

@ -1,4 +0,0 @@
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

1
test/TEST-21-SYSUSERS/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

1
test/TEST-21-SYSUSERS/test.sh
View File

@ -15,6 +15,7 @@ prepare_testdir() {
for i in $1.initial-{passwd,group,shadow}; do
test -f $i && cp $i $TESTDIR/etc/${i#*.initial-}
done
return 0
}
preprocess() {

4
test/TEST-22-TMPFILES/Makefile
View File

@ -1,4 +0,0 @@
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

1
test/TEST-22-TMPFILES/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

4
test/TEST-23-TYPE-EXEC/Makefile
View File

@ -1,4 +0,0 @@
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

1
test/TEST-23-TYPE-EXEC/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

1
test/TEST-24-UNIT-TESTS/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

106
test/TEST-24-UNIT-TESTS/test.sh Executable file
View File

@ -0,0 +1,106 @@
#!/bin/bash
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
set -e
TEST_DESCRIPTION="Run unit tests under containers"
RUN_IN_UNPRIVILEGED_CONTAINER=yes
. $TEST_BASE_DIR/test-functions
check_result_nspawn() {
local _ret=1
[[ -e $TESTDIR/$1/testok ]] && _ret=0
if [[ -s $TESTDIR/$1/failed ]]; then
_ret=$(($_ret+1))
echo "=== Failed test log ==="
cat $TESTDIR/$1/failed
else
if [[ -s $TESTDIR/$1/skipped ]]; then
echo "=== Skipped test log =="
cat $TESTDIR/$1/skipped
fi
if [[ -s $TESTDIR/$1/testok ]]; then
echo "=== Passed tests ==="
cat $TESTDIR/$1/testok
fi
fi
cp -a $TESTDIR/$1/var/log/journal $TESTDIR
[[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
return $_ret
}
check_result_qemu() {
local _ret=1
mkdir -p $TESTDIR/root
mount ${LOOPDEV}p1 $TESTDIR/root
[[ -e $TESTDIR/root/testok ]] && _ret=0
if [[ -s $TESTDIR/root/failed ]]; then
_ret=$(($_ret+1))
echo "=== Failed test log ==="
cat $TESTDIR/root/failed
else
if [[ -s $TESTDIR/root/skipped ]]; then
echo "=== Skipped test log =="
cat $TESTDIR/root/skipped
fi
if [[ -s $TESTDIR/root/testok ]]; then
echo "=== Passed tests ==="
cat $TESTDIR/root/testok
fi
fi
cp -a $TESTDIR/root/var/log/journal $TESTDIR
umount $TESTDIR/root
[[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
return $_ret
}
test_setup() {
if type -P meson && [[ "$(meson configure $BUILD_DIR | grep install-tests | awk '{ print $2 }')" != "true" ]]; then
dfatal "Needs to be built with -Dinstall-tests=true"
exit 1
fi
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)
for i in getfacl dirname basename capsh cut rev stat mktemp rmdir ionice unshare uname tr awk getent diff xzcat lz4cat; do
inst_binary $i
done
inst /etc/hosts
setup_basic_environment
install_keymaps yes
install_zoneinfo
# setup the testsuite service
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
[Unit]
Description=Testsuite service
[Service]
ExecStart=/testsuite.sh
Type=oneshot
EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
setup_nspawn_root
# mask some services that we do not want to run in these tests
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root
}
do_test "$@"

34
test/TEST-24-UNIT-TESTS/testsuite.sh Executable file
View File

@ -0,0 +1,34 @@
#!/bin/bash
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
#set -ex
#set -o pipefail
for i in /usr/lib/systemd/tests/test-*; do
if [[ ! -x $i ]]; then continue; fi
NAME=${i##*/}
echo "Running $NAME"
$i > /$NAME.log 2>&1
ret=$?
if (( $ret && $ret != 77 )); then
echo "$NAME failed with $ret"
echo $NAME >> /failed-tests
echo "--- $NAME begin ---" >> /failed
cat /$NAME.log >> /failed
echo "--- $NAME end ---" >> /failed
elif (( $ret == 77 )); then
echo "$NAME skipped"
echo $NAME >> /skipped-tests
echo "--- $NAME begin ---" >> /skipped
cat /$NAME.log >> /skipped
echo "--- $NAME end ---" >> /skipped
else
echo "$NAME OK"
echo $NAME >> /testok
fi
systemd-cat echo "--- $NAME ---"
systemd-cat cat /$NAME.log
done
exit 0

33
test/test-functions
View File

@ -421,7 +421,7 @@ get_ldpath() {
install_missing_libraries() {
# install possible missing libraries
for i in $initdir{,/usr}/{sbin,bin}/* $initdir{,/usr}/lib/systemd/*; do
for i in $initdir{,/usr}/{sbin,bin}/* $initdir{,/usr}/lib/systemd/{,tests/{,manual/,unsafe/}}*; do
LD_LIBRARY_PATH=$(get_ldpath $i) inst_libs $i
done
}
@ -454,7 +454,7 @@ EOF
}
check_result_nspawn() {
ret=1
local ret=1
[[ -e $TESTDIR/$1/testok ]] && ret=0
[[ -f $TESTDIR/$1/failed ]] && cp -a $TESTDIR/$1/failed $TESTDIR
cp -a $TESTDIR/$1/var/log/journal $TESTDIR
@ -467,7 +467,7 @@ check_result_nspawn() {
# can be overridden in specific test
check_result_qemu() {
ret=1
local ret=1
mkdir -p $TESTDIR/root
mount ${LOOPDEV}p1 $TESTDIR/root
[[ -e $TESTDIR/root/testok ]] && ret=0
@ -623,13 +623,34 @@ install_pam() {
}
install_keymaps() {
# The first three paths may be deprecated.
# It seems now the last two paths are used by many distributions.
for i in \
/usr/lib/kbd/keymaps/include/* \
/usr/lib/kbd/keymaps/i386/include/* \
/usr/lib/kbd/keymaps/i386/qwerty/us.*; do
/usr/lib/kbd/keymaps/i386/qwerty/us.* \
/usr/lib/kbd/keymaps/legacy/include/* \
/usr/lib/kbd/keymaps/legacy/i386/qwerty/us.*; do
[[ -f $i ]] || continue
inst $i
done
# When it takes any argument, then install more keymaps.
if [[ -n $1 ]]; then
for i in \
/usr/lib/kbd/keymaps/i386/*/* \
/usr/lib/kbd/keymaps/legacy/i386/*/*; do
[[ -f $i ]] || continue
inst $i
done
fi
}
install_zoneinfo() {
for i in /usr/share/zoneinfo/{,*/,*/*/}*; do
[[ -f $i ]] || continue
inst $i
done
}
install_fonts() {
@ -1526,7 +1547,9 @@ do_test() {
case $1 in
--run)
echo "TEST RUN: $TEST_DESCRIPTION"
if test_run; then
test_run
ret=$?
if (( $ret == 0 )); then
echo "TEST RUN: $TEST_DESCRIPTION [OK]"
else
echo "TEST RUN: $TEST_DESCRIPTION [FAILED]"