diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2022-09-26 20:43:40 +1000 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2022-09-29 12:21:19 +0200 |
| commit | feb8946ff5f0b6813409146a9c0e0915dc602ebd (patch) | |
| tree | 6220a2f433f04270defee9f7e8dd4a6bacf71c2d /test/Makefile | |
| parent | 0a15b467d4d15eddef0d290aa5b251e30c8b467a (diff) | |
| download | passt-feb8946ff5f0b6813409146a9c0e0915dc602ebd.tar passt-feb8946ff5f0b6813409146a9c0e0915dc602ebd.tar.gz passt-feb8946ff5f0b6813409146a9c0e0915dc602ebd.tar.bz2 passt-feb8946ff5f0b6813409146a9c0e0915dc602ebd.tar.lz passt-feb8946ff5f0b6813409146a9c0e0915dc602ebd.tar.xz passt-feb8946ff5f0b6813409146a9c0e0915dc602ebd.tar.zst passt-feb8946ff5f0b6813409146a9c0e0915dc602ebd.zip | |
test: Simplify data handling for transfer tests
Many of our tests are based around performing transfers of sample data
across passt/pasta created links. The data flow here can be a bit
hard to follow since, e.g. we create a file transfer it to the guest,
then transfer it back to the host across several different tests.
This also means that the test cases aren't independent of each other.
Because we don't have the original file available at both ends in some
cases, we compare them by generating md5sums at each end and comparing
them, which is a bit complicated.
Make a number of changes to simplify this:
1. Pre-generate the sample data files as a test asset, rather than
building them on the fly during the tests proper
2. Include the sample data files in the mbuto guest image
3. Because we have good copies of the original data available in all
contexts, we can now simply use 'cmp' to check if the transfer
has worked, avoiding md5sum complications.
4. Similarly we can always use the original copy of the sample data
on the send side of each transfer, meaning that the tests become
more independent of each other.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/test/Makefile b/test/Makefile index cc1a818..08f0c2d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -54,10 +54,12 @@ UBUNTU_IMGS = $(UBUNTU_OLD_IMGS) $(UBUNTU_NEW_IMGS) DOWNLOAD_ASSETS = mbuto \ $(DEBIAN_IMGS) $(FEDORA_IMGS) $(OPENSUSE_IMGS) $(UBUNTU_IMGS) +TESTDATA_ASSETS = small.bin big.bin medium.bin LOCAL_ASSETS = mbuto.img QEMU_EFI.fd \ $(DEBIAN_IMGS:%=prepared-%) $(FEDORA_IMGS:%=prepared-%) \ $(UBUNTU_NEW_IMGS:%=prepared-%) \ - nsholder guest-key guest-key.pub + nsholder guest-key guest-key.pub \ + $(TESTDATA_ASSETS) ASSETS = $(DOWNLOAD_ASSETS) $(LOCAL_ASSETS) @@ -71,7 +73,7 @@ mbuto: guest-key guest-key.pub: ssh-keygen -f guest-key -N '' -mbuto.img: passt.mbuto mbuto guest-key.pub +mbuto.img: passt.mbuto mbuto guest-key.pub $(TESTDATA_ASSETS) ./mbuto/mbuto -p ./$< -c lz4 -f $@ nsholder: nsholder.c @@ -88,6 +90,15 @@ prepared-%.img: %.img ./prepare-distro-img.sh qemu-img create -f qcow2 -F qcow2 -b $< $@ ./prepare-distro-img.sh $(IMGTYPE) $@ +small.bin: + dd if=/dev/urandom bs=2k count=1 of=$@ + +medium.bin: + dd if=/dev/urandom bs=1k count=5 of=$@ + +big.bin: + dd if=/dev/urandom bs=1M count=10 of=$@ + check: assets ./run |