[PATCH 01/11] test: Correctly match "background" with "wait" commands

public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed

From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: [PATCH 01/11] test: Correctly match "background" with "wait" commands
Date: Fri, 02 Sep 2022 12:14:50 +1000	[thread overview]
Message-ID: <20220902021500.25358-2-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20220902021500.25358-1-david@gibson.dropbear.id.au>

[-- Attachment #1: Type: text/plain, Size: 4021 bytes --]

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(a)gibson.dropbear.id.au>
---
 test/tcp/passt_in_ns | 8 ++++----
 test/tcp/pasta       | 1 -
 test/udp/passt_in_ns | 4 ++--
 test/udp/pasta       | 1 -
 4 files changed, 6 insertions(+), 8 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
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__))
-- 
@@ -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__))
-- 
2.37.2

next prev parent reply	other threads:[~2022-09-02  2:14 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-02  2:14 [PATCH 00/11] Improve command dispatch in test scripts David Gibson
2022-09-02  2:14 ` David Gibson [this message]
2022-09-02  2:14 ` [PATCH 02/11] test: Context execution helpers David Gibson
2022-09-02  2:14 ` [PATCH 03/11] test: Allow a tmux pane to watch commands executed in contexts David Gibson
2022-09-02  2:14 ` [PATCH 04/11] test: Integration of old-style pane execution and new context execution David Gibson
2022-09-02  2:14 ` [PATCH 05/11] test: Issue host commands via context for most tests David Gibson
2022-09-02  2:14 ` [PATCH 06/11] test: Use new-style contexts for passt pane in the pasta and passt tests David Gibson
2022-09-02  2:14 ` [PATCH 07/11] test: Add nsholder utility David Gibson
2022-09-02  2:14 ` [PATCH 08/11] test: Extend context system to run commands in namespace for pasta tests David Gibson
2022-09-02  2:14 ` [PATCH 09/11] test: Use context system for guest commands David Gibson
2022-09-02  2:14 ` [PATCH 10/11] test: Use context system for two_guests tests David Gibson
2022-09-02  2:15 ` [PATCH 11/11] test: Use new-style command issue for passt_in_ns tests David Gibson

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:ab22485 dfblob:0d6c729 dfblob:8f8090b dfblob:25063ea
dfblob:976e4e9 dfblob:a13a2ff dfblob:f5ea402 dfblob:0767e0b
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220902021500.25358-2-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).