From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: Re: [PATCH v4 08/12] test: Use paths in __STATEDIR__ instead of 'temp' and 'tempdir' directives
Date: Sat, 10 Sep 2022 17:44:03 +1000 [thread overview]
Message-ID: <YxxAQ1rAzsNqmuj3@yekko> (raw)
In-Reply-To: <20220909170002.6bebe117@elisabeth>
[-- Attachment #1: Type: text/plain, Size: 4925 bytes --]
On Fri, Sep 09, 2022 at 05:00:02PM +0200, Stefano Brivio wrote:
> On Fri, 9 Sep 2022 13:30:24 +1000
> David Gibson <david(a)gibson.dropbear.id.au> wrote:
>
> > Instead of using the 'temp' and 'tempdir' DSL directives to create
> > temporary files, use fixed paths relative to __STATEDIR__. This has two
> > advantages:
> > 1) The files are automatically cleaned up if the tests fail (and even if
> > that doesn't work they're easier to clean up manuall)
> > 2) When debugging tests it's easier to figure out which of the temporary
> > files are relevant to whatever's going wrong
> >
> > Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
> >
> > [...]
> >
> > +++ b/test/passt/udp
> > @@ -15,9 +15,9 @@ gtools socat tee grep cat ip jq md5sum cut
> > htools printf dd socat tee grep cat ip jq md5sum cut
> >
> > test UDP/IPv4: host to guest
> > -temp TEMP
> > -temp SC_PID
> > -guestb (socat -u UDP4-LISTEN:10001 STDOUT & echo $! > __SC_PID__) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
> > +set TEMP __STATEDIR__/data
> > +set SC_PID __STATEDIR__/socat.pid
> > +guestb (socat -u UDP4-LISTEN:10001 STDOUT & echo $! > sc.pid) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat sc.pid))
>
> Here it's sc.pid,
>
> > sleep 1
> > host dd if=/dev/urandom bs=1k count=5 > __TEMP__ && printf "\nEND_OF_TEST\n" >> __TEMP__
> > host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10001
> > diff --git a/test/passt_in_ns/tcp b/test/passt_in_ns/tcp
> > index 5ec95e8..a2cb667 100644
> > --- a/test/passt_in_ns/tcp
> > +++ b/test/passt_in_ns/tcp
> > @@ -16,7 +16,7 @@ htools dd socat ip jq md5sum cut
> > nstools socat ip jq md5sum cut
> >
> > test TCP/IPv4: host to guest: big transfer
> > -temp TEMP_BIG
> > +set TEMP_BIG __STATEDIR__/big.img
> > guestb socat -u TCP4-LISTEN:10001 OPEN:test_big.bin,create,trunc
> > sleep 1
> > host dd if=/dev/urandom bs=1M count=10 of=__TEMP_BIG__
> > @@ -27,7 +27,7 @@ gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1
> > check [ "__GUEST_MD5_BIG__" = "__MD5_BIG__" ]
> >
> > test TCP/IPv4: host to ns: big transfer
> > -temp TEMP_NS_BIG
> > +set TEMP_NS_BIG __STATEDIR__/big_ns.img
> > nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_NS_BIG__,create,trunc
> > host socat -u OPEN:__TEMP_BIG__ TCP4:127.0.0.1:10002
> > nsw
> > @@ -82,7 +82,7 @@ gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1
> > check [ "__GUEST_MD5_BIG__" = "__MD5_BIG__" ]
> >
> > test TCP/IPv4: host to guest: small transfer
> > -temp TEMP_SMALL
> > +set TEMP_SMALL __STATEDIR__/small.img
> > guestb socat -u TCP4-LISTEN:10001 OPEN:test_small.bin,create,trunc
> > sleep 1
> > host dd if=/dev/urandom bs=2k count=100 of=__TEMP_SMALL__
> > @@ -93,7 +93,7 @@ gout GUEST_MD5_SMALL md5sum test_small.bin | cut -d' ' -f1
> > check [ "__GUEST_MD5_SMALL__" = "__MD5_SMALL__" ]
> >
> > test TCP/IPv4: host to ns: small transfer
> > -temp TEMP_NS_SMALL
> > +set TEMP_NS_SMALL __STATEDIR__/small_ns.img
> > nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_NS_SMALL__,create,trunc
> > host socat -u OPEN:__TEMP_SMALL__ TCP4:127.0.0.1:10002
> > nsw
> > diff --git a/test/passt_in_ns/udp b/test/passt_in_ns/udp
> > index c22a68f..3b1e521 100644
> > --- a/test/passt_in_ns/udp
> > +++ b/test/passt_in_ns/udp
> > @@ -16,8 +16,8 @@ nstools socat tee grep cat ip jq md5sum cut
> > htools printf dd socat tee grep cat ip jq md5sum cut
> >
> > test UDP/IPv4: host to guest
> > -temp TEMP
> > -temp SC_PID
> > +set TEMP __STATEDIR__/data
> > +set SC_PID __STATEDIR__/socat.pid
> > guestb (socat -u UDP4-LISTEN:10001 STDOUT & echo $! > sc.pid) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat sc.pid))
>
> here, too,
>
> > sleep 1
> > host dd if=/dev/urandom bs=1k count=5 > __TEMP__ && printf "\nEND_OF_TEST\n" >> __TEMP__
> > @@ -28,7 +28,7 @@ gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1
> > check [ "__GUEST_MD5__" = "__MD5__" ]
> >
> > test UDP/IPv4: host to ns
> > -temp TEMP_NS
> > +set TEMP_NS __STATEDIR__/data_ns
> > nsb (socat -u UDP4-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
>
> ...here it's __SC_PID__.
>
> It looks a bit random to me, but anyway all those go away with your
> (much needed) patch "test: Simpler termination handling for UDP tests",
> so I'm also fine to apply it like that.
It's __SC_PID__ on host and namespace, sc.pid for the guest. The
guest doesn't share a filesystem so __STATEDIR__ isn't meeaningful
there.
In any case they both go away with the test cleanup that goes along
with the handling of 0-length UDP packets.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2022-09-10 7:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 3:30 [PATCH v4 00/12] Improve handling of test temporary files David Gibson
2022-09-09 3:30 ` [PATCH v4 01/12] test: Group tests by context then protocol, rather than the reverse David Gibson
2022-09-09 3:30 ` [PATCH v4 02/12] test: Remove unused variable FFMPEG_PID_FILE David Gibson
2022-09-09 3:30 ` [PATCH v4 03/12] test: Actually run cleanup function David Gibson
2022-09-09 3:30 ` [PATCH v4 04/12] test: Create common state directories for temporary files David Gibson
2022-09-09 3:30 ` [PATCH v4 05/12] test: Move passt_test_log_pipe to state directory David Gibson
2022-09-09 3:30 ` [PATCH v4 06/12] test: Move context temporary files to state dir David Gibson
2022-09-09 3:30 ` [PATCH v4 07/12] test: Dont regnerate small test file in pasta/tcp David Gibson
2022-09-09 3:30 ` [PATCH v4 08/12] test: Use paths in __STATEDIR__ instead of 'temp' and 'tempdir' directives David Gibson
2022-09-09 15:00 ` Stefano Brivio
2022-09-10 7:44 ` David Gibson [this message]
2022-09-10 20:41 ` Stefano Brivio
2022-09-09 3:30 ` [PATCH v4 09/12] test: Move pause temporary file to state directory David Gibson
2022-09-09 3:30 ` [PATCH v4 10/12] test: Store pcap files in $LOGDIR instead of /tmp David Gibson
2022-09-09 3:30 ` [PATCH v4 11/12] test: Move pidfiles and nsholder sockets into state directory David Gibson
2022-09-09 3:30 ` [PATCH v4 12/12] test: Move video processing files to $STATEBASE David Gibson
2022-09-09 15:00 ` Stefano Brivio
2022-09-10 7:45 ` David Gibson
2022-09-10 20:41 ` Stefano Brivio
2022-09-13 4:41 ` David Gibson
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=YxxAQ1rAzsNqmuj3@yekko \
--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).