tests: don't depend on internal state of composer

Cherry-picked from 123827c90a

Related: rhbz#1825190
This commit is contained in:
Lars Karlitski 2019-12-04 00:38:43 +01:00 committed by Brian C. Lane
parent 6b2efa0da1
commit 8f860cc8a1
2 changed files with 2 additions and 2 deletions

View File

@ -48,7 +48,6 @@ __EOF__
rlRun -t -c "$CLI blueprints push beakerlib.toml" rlRun -t -c "$CLI blueprints push beakerlib.toml"
rlAssertEquals "pushed bp is found via list" "`$CLI blueprints list | grep beakerlib`" "beakerlib" rlAssertEquals "pushed bp is found via list" "`$CLI blueprints list | grep beakerlib`" "beakerlib"
rlAssertExists "$BLUEPRINTS_DIR/git/workspace/master/beakerlib.toml"
rlPhaseEnd rlPhaseEnd
rlPhaseStartTest "blueprints show" rlPhaseStartTest "blueprints show"
@ -77,7 +76,6 @@ __EOF__
rlPhaseStartTest "blueprints delete" rlPhaseStartTest "blueprints delete"
rlRun -t -c "$CLI blueprints delete beakerlib" rlRun -t -c "$CLI blueprints delete beakerlib"
rlAssertEquals "bp not found after delete" "`$CLI blueprints list | grep beakerlib`" "" rlAssertEquals "bp not found after delete" "`$CLI blueprints list | grep beakerlib`" ""
rlAssertNotExists "$BLUEPRINTS_DIR/git/workspace/master/beakerlib.toml"
rlPhaseEnd rlPhaseEnd
rlPhaseStartTest "start a compose with deleted blueprint" rlPhaseStartTest "start a compose with deleted blueprint"

View File

@ -103,7 +103,9 @@ rlJournalStart
rlRun -t -c "$CLI compose image $UUID" rlRun -t -c "$CLI compose image $UUID"
rlAssertExists "$UUID-disk.qcow2" rlAssertExists "$UUID-disk.qcow2"
fi
if [ "$BACKEND" != "osbuild-composer" ]; then
# because this path is listed in the documentation # because this path is listed in the documentation
rlAssertExists "/var/lib/lorax/composer/results/$UUID/" rlAssertExists "/var/lib/lorax/composer/results/$UUID/"
rlAssertExists "/var/lib/lorax/composer/results/$UUID/disk.qcow2" rlAssertExists "/var/lib/lorax/composer/results/$UUID/disk.qcow2"