aboutgitcodebugslistschat
path: root/test/udp
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-09-12 20:56:14 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-09-13 05:32:00 +0200
commit4fbd0a8ff95afcff6f8941035d2498c5457ab08d (patch)
treee3c5c63439e616575551af22df8eb5821ee7ed99 /test/udp
parentef6da157324bfc64a416b7ab419fdc5b9849a8b1 (diff)
downloadpasst-4fbd0a8ff95afcff6f8941035d2498c5457ab08d.tar
passt-4fbd0a8ff95afcff6f8941035d2498c5457ab08d.tar.gz
passt-4fbd0a8ff95afcff6f8941035d2498c5457ab08d.tar.bz2
passt-4fbd0a8ff95afcff6f8941035d2498c5457ab08d.tar.lz
passt-4fbd0a8ff95afcff6f8941035d2498c5457ab08d.tar.xz
passt-4fbd0a8ff95afcff6f8941035d2498c5457ab08d.tar.zst
passt-4fbd0a8ff95afcff6f8941035d2498c5457ab08d.zip
test: Correctly match "background" with "wait" commands
Our test DSL has a number of paired commands to run something in the background in a pane, then later to wait for it to complete. However, in some of the tests we have these mismatched - starting a command in one pane, then waiting for it in another. We appear to get away with this for some reason, but it's not correct and future changes make it cause more problems. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'test/udp')
-rw-r--r--test/udp/passt_in_ns4
-rw-r--r--test/udp/pasta1
2 files changed, 2 insertions, 3 deletions
diff --git a/test/udp/passt_in_ns b/test/udp/passt_in_ns
index 8f8090b..f5ea402 100644
--- a/test/udp/passt_in_ns
+++ b/test/udp/passt_in_ns
@@ -45,7 +45,7 @@ check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv4: guest to ns
nsb (socat -u UDP4-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
guest socat -u OPEN:test.bin UDP4:__GW__:10002
-hostw
+nsw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ]
@@ -106,7 +106,7 @@ check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv6: guest to ns
nsb (socat -u UDP6-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10002
-hostw
+nsw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ]
diff --git a/test/udp/pasta b/test/udp/pasta
index 25063ea..0767e0b 100644
--- a/test/udp/pasta
+++ b/test/udp/pasta
@@ -58,7 +58,6 @@ ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003
hostw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ]
-nsw
test UDP/IPv6: ns to host (via tap)
hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__))