aboutgitcodebugslistschat
path: root/test/tcp
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/tcp
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/tcp')
-rw-r--r--test/tcp/passt_in_ns8
-rw-r--r--test/tcp/pasta1
2 files changed, 4 insertions, 5 deletions
diff --git a/test/tcp/passt_in_ns b/test/tcp/passt_in_ns
index ab22485..976e4e9 100644
--- a/test/tcp/passt_in_ns
+++ b/test/tcp/passt_in_ns
@@ -44,7 +44,7 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
test TCP/IPv4: guest to ns: big transfer
nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_BIG__,create,trunc
guest socat -u OPEN:test_big.bin TCP4:__GW__:10002
-hostw
+nsw
hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1
check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
@@ -108,7 +108,7 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ]
test TCP/IPv4: guest to ns: small transfer
nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_SMALL__,create,trunc
guest socat -u OPEN:test_small.bin TCP4:__GW__:10002
-hostw
+nsw
hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1
check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ]
@@ -167,7 +167,7 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
test TCP/IPv6: guest to ns: big transfer
nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_BIG__,create,trunc
guest socat -u OPEN:test_big.bin TCP6:[__GW6__%__IFNAME__]:10002
-hostw
+nsw
hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1
check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
@@ -227,7 +227,7 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ]
test TCP/IPv6: guest to ns: small transfer
nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_SMALL__
guest socat -u OPEN:test_small.bin TCP6:[__GW6__%__IFNAME__]:10002
-hostw
+nsw
hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1
check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ]
diff --git a/test/tcp/pasta b/test/tcp/pasta
index 0d6c729..a13a2ff 100644
--- a/test/tcp/pasta
+++ b/test/tcp/pasta
@@ -80,7 +80,6 @@ ns socat -u OPEN:__TEMP_NS_BIG__ TCP6:[::1]:10003
hostw
hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1
check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ]
-nsw
test TCP/IPv6: ns to host (via tap): big transfer
hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc