From 114c1bbda78aaa9ba2c4445cfbd108f1512a2245 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Tue, 20 Aug 2019 11:52:50 +0300 Subject: [PATCH] New test: assert toml files in git workspace tests: export BLUEPRINTS_DIR for use in tests Depending on the way the tests are run the directory may be a temporary dir, or it may be the standard /var/lib/lorax/... path. Related: rhbz#1714103 --- tests/cli/test_blueprints_sanity.sh | 2 ++ tests/test_cli.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/cli/test_blueprints_sanity.sh b/tests/cli/test_blueprints_sanity.sh index a6bef801..3c9f9ff7 100755 --- a/tests/cli/test_blueprints_sanity.sh +++ b/tests/cli/test_blueprints_sanity.sh @@ -43,6 +43,7 @@ __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" @@ -71,6 +72,7 @@ __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/test_cli.sh b/tests/test_cli.sh index d67833ef..ddf0516b 100755 --- a/tests/test_cli.sh +++ b/tests/test_cli.sh @@ -59,6 +59,7 @@ if [ -z "$CLI" ]; then . ./tests/testenv.sh BLUEPRINTS_DIR=`mktemp -d '/tmp/composer-blueprints.XXXXX'` + export BLUEPRINTS_DIR cp ./tests/pylorax/blueprints/*.toml $BLUEPRINTS_DIR SHARE_DIR=`mktemp -d '/tmp/composer-share.XXXXX'` @@ -70,6 +71,7 @@ if [ -z "$CLI" ]; then ./src/sbin/lorax-composer --sharedir $SHARE_DIR $BLUEPRINTS_DIR & else export PACKAGE="composer-cli" + export BLUEPRINTS_DIR="/var/lib/lorax/composer/blueprints" systemctl stop lorax-composer setup_tests /usr/share/lorax /var/lib/lorax/composer/blueprints systemctl start lorax-composer