mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-11 05:17:44 +03:00
test: replace echo with socat
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
This commit is contained in:
parent
52c6c9eaec
commit
b35d6d828b
@ -17,7 +17,7 @@ test_setup() {
|
||||
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
|
||||
|
||||
setup_basic_environment
|
||||
dracut_install true rm
|
||||
dracut_install true rm socat
|
||||
|
||||
# setup the testsuite service
|
||||
cat >$initdir/etc/systemd/system/testsuite.service <<'EOF'
|
||||
@ -28,13 +28,13 @@ Description=Testsuite service
|
||||
Type=oneshot
|
||||
StandardOutput=tty
|
||||
StandardError=tty
|
||||
ExecStart=/bin/sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test.socket; echo > /run/test.ctl; >/testok'
|
||||
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]
|
||||
ListenFIFO=/run/test.ctl
|
||||
ListenStream=/run/test.ctl
|
||||
EOF
|
||||
|
||||
cat > $initdir/etc/systemd/system/test.service <<'EOF'
|
||||
|
Loading…
Reference in New Issue
Block a user