diff --git a/test/system/252-quadlet.bats b/test/system/252-quadlet.bats index a27f6732c3..12551c73b0 100644 --- a/test/system/252-quadlet.bats +++ b/test/system/252-quadlet.bats @@ -16,6 +16,8 @@ function start_time() { function setup() { skip_if_remote "quadlet tests are meaningless over remote" + test -x "$QUADLET" || die "Cannot run quadlet tests without executable \$QUADLET ($QUADLET)" + start_time basic_setup @@ -47,7 +49,9 @@ function run_quadlet() { local quadlet_tmpdir=$(mktemp -d --tmpdir=$PODMAN_TMPDIR quadlet.XXXXXX) cp $sourcefile $quadlet_tmpdir/ + echo "$_LOG_PROMPT $QUADLET $_DASHUSER $UNIT_DIR" QUADLET_UNIT_DIRS="$quadlet_tmpdir" run $QUADLET $_DASHUSER $UNIT_DIR + echo "$output" assert $status -eq 0 "Failed to convert quadlet file: $sourcefile" is "$output" "" "quadlet should report no errors" diff --git a/test/system/helpers.bash b/test/system/helpers.bash index f1b415eec2..d72212040c 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -2,7 +2,7 @@ # Podman command to run; may be podman-remote PODMAN=${PODMAN:-podman} -QUADLET=${QUADLET:-quadlet} +QUADLET=${QUADLET:-/usr/libexec/podman/quadlet} # Standard image to use for most tests PODMAN_TEST_IMAGE_REGISTRY=${PODMAN_TEST_IMAGE_REGISTRY:-"quay.io"}