diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2022-09-13 14:35:23 +1000 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2022-09-13 11:12:41 +0200 |
| commit | 1c36c8d3f8e05d6dbde2842b6c9f78ffc538036c (patch) | |
| tree | 81c5f4d49f8081cf39f4255bc5f06c2f15da8a0b /test/passt | |
| parent | c71a5e8528f7278a645ed3dab2c7e813dcb7d8bf (diff) | |
| download | passt-1c36c8d3f8e05d6dbde2842b6c9f78ffc538036c.tar passt-1c36c8d3f8e05d6dbde2842b6c9f78ffc538036c.tar.gz passt-1c36c8d3f8e05d6dbde2842b6c9f78ffc538036c.tar.bz2 passt-1c36c8d3f8e05d6dbde2842b6c9f78ffc538036c.tar.lz passt-1c36c8d3f8e05d6dbde2842b6c9f78ffc538036c.tar.xz passt-1c36c8d3f8e05d6dbde2842b6c9f78ffc538036c.tar.zst passt-1c36c8d3f8e05d6dbde2842b6c9f78ffc538036c.zip | |
test: Use paths in __STATEDIR__ instead of 'temp' and 'tempdir' directives
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@gibson.dropbear.id.au>
Diffstat (limited to 'test/passt')
| -rw-r--r-- | test/passt/tcp | 4 | ||||
| -rw-r--r-- | test/passt/udp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/passt/tcp b/test/passt/tcp index d5c8164..7af9c54 100644 --- a/test/passt/tcp +++ b/test/passt/tcp @@ -15,7 +15,7 @@ gtools socat ip jq md5sum cut htools dd socat ip jq md5sum cut test TCP/IPv4: host to guest: big transfer -temp TEMP_BIG +set TEMP_BIG __STATEDIR__/big guestb socat -u TCP4-LISTEN:10001,reuseaddr OPEN:test_big.bin,create,trunc sleep 1 host dd if=/dev/urandom bs=1M count=10 > __TEMP_BIG__ @@ -34,7 +34,7 @@ hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 check [ "__GUEST_MD5_BIG__" = "__HOST_MD5_BIG__" ] test TCP/IPv4: host to guest: small transfer -temp TEMP_SMALL +set TEMP_SMALL __STATEDIR__/small guestb socat -u TCP4-LISTEN:10001,reuseaddr OPEN:test_small.bin,create,trunc sleep 1 host dd if=/dev/urandom bs=2k count=1 > __TEMP_SMALL__ diff --git a/test/passt/udp b/test/passt/udp index 56d01b3..0253a86 100644 --- a/test/passt/udp +++ 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)) 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 |