particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests/compose: use qcow2 rather than ami for tests

Browse source 
qcow2, unlike ami, is guaranteed to exist on all the architectures we
support.

Also, now that we preserve the cache, make two composes, rather than
just one. This verifies that nothing breaks horribly just because the
cache not being cold. The fact that we have a cache at all should make
this tolerably fast.

This should fix #693.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-06-08 01:25:06 +02:00 • committed by Lars Karlitski
parent 5903cc42fe
commit 52273756d4
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/osbuild-tests/main_test.go
View file

@ -46,7 +46,7 @@ func TestComposeCommands(t *testing.T) {
runComposer(t, "compose", "list", "failed")
// Full integration tests
uuid := buildCompose(t, "empty", "ami")
uuid := buildCompose(t, "empty", "qcow2")
defer deleteCompose(t, uuid)
runComposer(t, "compose", "info", uuid.String())
@ -73,9 +73,13 @@ func TestComposeCommands(t *testing.T) {
defer os.Remove(uuid.String() + "-logs.tar")
runComposer(t, "compose", "image", uuid.String())
_, err = os.Stat(uuid.String() + "-image.vhdx")
require.NoError(t, err, "'%s-image.vhdx' not found", uuid.String())
defer os.Remove(uuid.String() + "-image.vhdx")
_, err = os.Stat(uuid.String() + "-disk.qcow2")
require.NoError(t, err, "'%s-disk.qcow2' not found", uuid.String())
defer os.Remove(uuid.String() + "-disk.qcow2")
// Check that reusing the cache works ok
uuid = buildCompose(t, "empty", "qcow2")
defer deleteCompose(t, uuid)
// https://github.com/osbuild/osbuild-composer/pull/180
// uuid = startCompose(t, "empty", "tar")