mirror of
https://github.com/systemd/systemd.git
synced 2024-11-05 06:52:22 +03:00
b35d6d828b
The original version of the test used netcat along with a standard
AF_UNIX socket, which caused issues across different netcat
implementations. The AF_UNIX socket was then replaced by a FIFO with a
simple echo, which, however, suffers from the same issue (some echo
implementations don't check if the write() was successful).
Let's revert back to the AF_UNIX socket, but replace netcat with socat,
which, hopefully, resolves the main issue.
Relevant commit: 9b45c2bf02
65 lines
1.8 KiB
Bash
Executable File
65 lines
1.8 KiB
Bash
Executable File
#!/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="https://github.com/systemd/systemd/issues/2467"
|
|
|
|
. $TEST_BASE_DIR/test-functions
|
|
|
|
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
|
|
dracut_install true rm socat
|
|
|
|
# setup the testsuite service
|
|
cat >$initdir/etc/systemd/system/testsuite.service <<'EOF'
|
|
[Unit]
|
|
Description=Testsuite service
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
StandardOutput=tty
|
|
StandardError=tty
|
|
ExecStart=/bin/sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test.socket; printf x > test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok'
|
|
TimeoutStartSec=10s
|
|
EOF
|
|
|
|
cat >$initdir/etc/systemd/system/test.socket <<'EOF'
|
|
[Socket]
|
|
ListenStream=/run/test.ctl
|
|
EOF
|
|
|
|
cat > $initdir/etc/systemd/system/test.service <<'EOF'
|
|
[Unit]
|
|
Requires=test.socket
|
|
ConditionPathExistsGlob=/tmp/nonexistent
|
|
|
|
[Service]
|
|
ExecStart=/bin/true
|
|
EOF
|
|
|
|
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-hwdb-update.service
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
|
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 "$@"
|