Skip to content

Commit

Permalink
Merge pull request containers#17525 from edsantiago/quadlet_argh
Browse files Browse the repository at this point in the history
quadlet system tests: add useful defaults, logging
  • Loading branch information
openshift-merge-robot authored Feb 16, 2023
2 parents 8a6b373 + a467740 commit 6f40253
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions test/system/252-quadlet.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion test/system/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down

0 comments on commit 6f40253

Please sign in to comment.