From 8f860cc8a1ae0636aef122b5257b40244208ce09 Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Wed, 4 Dec 2019 00:38:43 +0100 Subject: [PATCH] tests: don't depend on internal state of composer Cherry-picked from 123827c90a981dc5786da40233e0f134754d8b19 Related: rhbz#1825190 --- tests/cli/test_blueprints_sanity.sh | 2 -- tests/cli/test_compose_sanity.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cli/test_blueprints_sanity.sh b/tests/cli/test_blueprints_sanity.sh index 58bb199e..702391bf 100755 --- a/tests/cli/test_blueprints_sanity.sh +++ b/tests/cli/test_blueprints_sanity.sh @@ -48,7 +48,6 @@ __EOF__ rlRun -t -c "$CLI blueprints push beakerlib.toml" rlAssertEquals "pushed bp is found via list" "`$CLI blueprints list | grep beakerlib`" "beakerlib" - rlAssertExists "$BLUEPRINTS_DIR/git/workspace/master/beakerlib.toml" rlPhaseEnd rlPhaseStartTest "blueprints show" @@ -77,7 +76,6 @@ __EOF__ rlPhaseStartTest "blueprints delete" rlRun -t -c "$CLI blueprints delete beakerlib" rlAssertEquals "bp not found after delete" "`$CLI blueprints list | grep beakerlib`" "" - rlAssertNotExists "$BLUEPRINTS_DIR/git/workspace/master/beakerlib.toml" rlPhaseEnd rlPhaseStartTest "start a compose with deleted blueprint" diff --git a/tests/cli/test_compose_sanity.sh b/tests/cli/test_compose_sanity.sh index 686f008e..7d24c11a 100755 --- a/tests/cli/test_compose_sanity.sh +++ b/tests/cli/test_compose_sanity.sh @@ -103,7 +103,9 @@ rlJournalStart rlRun -t -c "$CLI compose image $UUID" rlAssertExists "$UUID-disk.qcow2" + fi + if [ "$BACKEND" != "osbuild-composer" ]; then # because this path is listed in the documentation rlAssertExists "/var/lib/lorax/composer/results/$UUID/" rlAssertExists "/var/lib/lorax/composer/results/$UUID/disk.qcow2"