colin/passt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Use paths in __STATEDIR__ instead of 'temp' and 'tempdir' directives

Browse Source 
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>
This commit is contained in:
David Gibson
2022-09-13 14:35:23 +10:00
committed by Stefano Brivio
parent c71a5e8528
commit 1c36c8d3f8
15 changed files with 69 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/demo/passt
View File

@@ -20,8 +20,7 @@ sleep 3
say Let's fetch the source
sleep 1
tempdir TEMPDIR
host cd __TEMPDIR__
host cd __STATEDIR__
host git clone git://passt.top/passt
sleep 1
@@ -52,10 +51,10 @@ host q
nl
nl
say Let's create a small initramfs image for the guest.
guest cd __TEMPDIR__
guest cd __STATEDIR__
guest git clone git://mbuto.sh/mbuto
guest cd mbuto
guest ./mbuto -f passt.img -p __TEMPDIR__/passt/test/passt.mbuto -c lz4
guest ./mbuto -f passt.img -p __STATEDIR__/passt/test/passt.mbuto -c lz4
sleep 2
nl
@@ -69,7 +68,7 @@ nl
say 'pasta' demo above.
sleep 3
passt cd __TEMPDIR__/passt
passt cd __STATEDIR__/passt
passtb ./pasta -P /tmp/pasta.pid
sleep 3
passt /sbin/dhclient -4 --no-pid

12
test/demo/pasta
View File

@@ -20,8 +20,7 @@ sleep 3
say Let's fetch the source
sleep 1
tempdir TEMPDIR
host cd __TEMPDIR__
host cd __STATEDIR__
host git clone git://passt.top/passt
sleep 1
@@ -47,7 +46,7 @@ sleep 10
nl
say without PID, it will create a namespace.
sleep 3
passt cd __TEMPDIR__/passt
passt cd __STATEDIR__/passt
passtb ./pasta -P /tmp/pasta.pid
sleep 3
@@ -140,13 +139,12 @@ say can also take packet captures.
sleep 3
passt exit
sleep 2
temp TEMP
passtb ./pasta -p __TEMP__.pcap
passtb ./pasta -p __STATEDIR__/demo_pasta.pcap
sleep 2
passt
passt /sbin/dhclient -4 --no-pid
sleep 2
hostb tshark -r __TEMP__.pcap
hostb tshark -r __STATEDIR__/demo_pasta.pcap
sleep 5
nl
@@ -257,7 +255,7 @@ sleep 2
killp PASST
killp HOST
sleep 2
ns cd __TEMPDIR__/passt
ns cd __STATEDIR__/passt
nsb perf report -g --max-stack 3
sleep 10

11
test/demo/podman
View File

@@ -24,14 +24,13 @@ sleep 3
say Let's fetch Podman
sleep 1
tempdir TEMPDIR
host git -C __TEMPDIR__ clone https://github.com/containers/podman.git
host git -C __STATEDIR__ clone https://github.com/containers/podman.git
sleep 1
say , patch it
sleep 1
host cp ../contrib/podman/0001-libpod-Add-pasta-networking-mode.patch __TEMPDIR__/podman
host cd __TEMPDIR__/podman
host cp ../contrib/podman/0001-libpod-Add-pasta-networking-mode.patch __STATEDIR__/podman
host cd __STATEDIR__/podman
host git am -3 0001-libpod-Add-pasta-networking-mode.patch
sleep 1
@@ -54,7 +53,7 @@ nl
say Let's start a container with it
sleep 1
ns1 cd __TEMPDIR__/podman
ns1 cd __STATEDIR__/podman
ns1b ./bin/podman run --rm -ti alpine sh
sleep 2
@@ -64,7 +63,7 @@ say and one with
em pasta
say instead.
ns2 cd __TEMPDIR__/podman
ns2 cd __STATEDIR__/podman
ns2b ./bin/podman run --net=pasta --rm -ti alpine sh
sleep 2