aboutgitcodebugslistschat
path: root/test/pasta
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-09-13 16:37:45 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-09-13 11:14:29 +0200
commit9fc476af6ebcef88e128fb681631c3a39243f4f2 (patch)
treee3fb032aaf752ddbc2bad7d01e14723a4730be67 /test/pasta
parentaf9c98af5ffc7502c6292a36ffae4913b1ce9acf (diff)
downloadpasst-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar
passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.gz
passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.bz2
passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.lz
passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.xz
passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.zst
passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.zip
test: Simpler termination handling for UDP tests
Because UDP is connectionless we don't have an in-built end-of-stream signal for our connectivity tests. We work around this by explicitly adding an end marker to our sample data and killing the listening end once it is seen. However, socat has some built-in options - null-eof and shut-null - which can be used to signal the end of stream with a zero-length UDP packet. Use these to simplify how the UDP tests are implemented. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'test/pasta')
-rw-r--r--test/pasta/udp31
1 files changed, 15 insertions, 16 deletions
diff --git a/test/pasta/udp b/test/pasta/udp
index 74148e3..fc6bf0a 100644
--- a/test/pasta/udp
+++ b/test/pasta/udp
@@ -11,59 +11,58 @@
# Copyright (c) 2021 Red Hat GmbH
# Author: Stefano Brivio <sbrivio@redhat.com>
-nstools socat tee grep cat ip jq md5sum cut
-htools printf dd socat tee grep cat ip jq md5sum cut
+nstools socat ip jq md5sum cut
+htools dd socat ip jq md5sum cut
test UDP/IPv4: host to ns
set TEMP __STATEDIR__/data
set TEMP_NS __STATEDIR__/data_ns
-set SC_PID __STATEDIR__/socat.pid
-nsb (socat -u UDP4-LISTEN:10002,bind=127.0.0.1 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
-host dd if=/dev/urandom bs=1k count=5 > __TEMP__ && printf "\nEND_OF_TEST\n" >> __TEMP__
+nsb socat -u UDP4-LISTEN:10002,bind=127.0.0.1,null-eof OPEN:__TEMP_NS__,create,trunc
+host dd if=/dev/urandom bs=1k count=5 > __TEMP__
-host socat OPEN:__TEMP__ UDP4:127.0.0.1:10002
+host socat OPEN:__TEMP__ UDP4:127.0.0.1:10002,shut-null
nsw
hout MD5 md5sum __TEMP__ | cut -d' ' -f1
nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1
check [ "__NS_MD5__" = "__MD5__" ]
test UDP/IPv4: ns to host (recvmmsg/sendmmsg)
-hostb (socat -u UDP4-LISTEN:10003,bind=127.0.0.1 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
+hostb socat -u UDP4-LISTEN:10003,bind=127.0.0.1,null-eof OPEN:__TEMP__,create,trunc
sleep 1
-ns socat OPEN:__TEMP_NS__ UDP4:127.0.0.1:10003
+ns socat OPEN:__TEMP_NS__ UDP4:127.0.0.1:10003,shut-null
hostw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv4: ns to host (via tap)
-hostb (socat -u UDP4-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
+hostb socat -u UDP4-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc
nsout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway'
-ns socat -u OPEN:__TEMP_NS__ UDP4:__GW__:10003
+ns socat -u OPEN:__TEMP_NS__ UDP4:__GW__:10003,shut-null
hostw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv6: host to ns
-nsb (socat -u UDP6-LISTEN:10002,bind=[::1] STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
-host socat -u OPEN:__TEMP__ UDP6:[::1]:10002
+nsb socat -u UDP6-LISTEN:10002,bind=[::1],null-eof OPEN:__TEMP_NS__,create,trunc
+host socat -u OPEN:__TEMP__ UDP6:[::1]:10002,shut-null
nsw
hout MD5 md5sum __TEMP__ | cut -d' ' -f1
nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1
check [ "__NS_MD5__" = "__MD5__" ]
test UDP/IPv6: ns to host (recvmmsg/sendmmsg)
-hostb (socat -u UDP6-LISTEN:10003,bind=[::1] STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
+hostb socat -u UDP6-LISTEN:10003,bind=[::1],null-eof OPEN:__TEMP__,create,trunc
sleep 1
-ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003
+ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003,shut-null
hostw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv6: ns to host (via tap)
-hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
+hostb socat -u UDP6-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc
nsout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway'
nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname'
-ns socat -u OPEN:__TEMP_NS__ UDP6:[__GW6__%__IFNAME__]:10003
+ns socat -u OPEN:__TEMP_NS__ UDP6:[__GW6__%__IFNAME__]:10003,shut-null
hostw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ]