mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: Correctly match "background" with "wait" commands

Browse source 
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>
This commit is contained in:
David Gibson 2022-09-12 20:56:14 +10:00 committed by Stefano Brivio
parent ef6da15732
commit 4fbd0a8ff9
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/tcp/passt_in_ns
View file

@ -44,7 +44,7 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
test TCP/IPv4: guest to ns: big transfer test TCP/IPv4: guest to ns: big transfer
nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_BIG__,create,trunc nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_BIG__,create,trunc
guest socat -u OPEN:test_big.bin TCP4:__GW__:10002 guest socat -u OPEN:test_big.bin TCP4:__GW__:10002
hostw nsw
hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1
check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
@ -108,7 +108,7 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ]
test TCP/IPv4: guest to ns: small transfer test TCP/IPv4: guest to ns: small transfer
nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_SMALL__,create,trunc nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_SMALL__,create,trunc
guest socat -u OPEN:test_small.bin TCP4:__GW__:10002 guest socat -u OPEN:test_small.bin TCP4:__GW__:10002
hostw nsw
hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1
check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ]
@ -167,7 +167,7 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
test TCP/IPv6: guest to ns: big transfer test TCP/IPv6: guest to ns: big transfer
nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_BIG__,create,trunc nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_BIG__,create,trunc
guest socat -u OPEN:test_big.bin TCP6:[__GW6__%__IFNAME__]:10002 guest socat -u OPEN:test_big.bin TCP6:[__GW6__%__IFNAME__]:10002
hostw nsw
hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1
check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
@ -227,7 +227,7 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ]
test TCP/IPv6: guest to ns: small transfer test TCP/IPv6: guest to ns: small transfer
nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_SMALL__ nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_SMALL__
guest socat -u OPEN:test_small.bin TCP6:[__GW6__%__IFNAME__]:10002 guest socat -u OPEN:test_small.bin TCP6:[__GW6__%__IFNAME__]:10002
hostw nsw
hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1
check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ]

1
test/tcp/pasta
View file

@ -80,7 +80,6 @@ ns socat -u OPEN:__TEMP_NS_BIG__ TCP6:[::1]:10003
hostw hostw
hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1
check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
nsw
test TCP/IPv6: ns to host (via tap): big transfer test TCP/IPv6: ns to host (via tap): big transfer
hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc

4
test/udp/passt_in_ns
View file

@ -45,7 +45,7 @@ check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv4: guest to ns 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__)) 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 guest socat -u OPEN:test.bin UDP4:__GW__:10002
hostw nsw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]
@ -106,7 +106,7 @@ check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv6: guest to ns 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__)) 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 guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10002
hostw nsw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]

1
test/udp/pasta
View file

@ -58,7 +58,6 @@ ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003
hostw hostw
hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]
nsw
test UDP/IPv6: ns to host (via tap) 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__)) hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__))