containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17525 from edsantiago/quadlet_argh 

quadlet system tests: add useful defaults, logging
This commit is contained in:
OpenShift Merge Robot 2023-02-16 09:45:21 -05:00 committed by GitHub
parent 8a6b373027 a4677405c8
commit 6f40253ed5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/system/252-quadlet.bats
View File

@ -16,6 +16,8 @@ function start_time() {
function setup() { function setup() {
skip_if_remote "quadlet tests are meaningless over remote" skip_if_remote "quadlet tests are meaningless over remote"
test -x "$QUADLET" || die "Cannot run quadlet tests without executable \$QUADLET ($QUADLET)"
start_time start_time
basic_setup basic_setup
@ -47,7 +49,9 @@ function run_quadlet() {
local quadlet_tmpdir=$(mktemp -d --tmpdir=$PODMAN_TMPDIR quadlet.XXXXXX) local quadlet_tmpdir=$(mktemp -d --tmpdir=$PODMAN_TMPDIR quadlet.XXXXXX)
cp $sourcefile $quadlet_tmpdir/ cp $sourcefile $quadlet_tmpdir/
echo "$_LOG_PROMPT $QUADLET $_DASHUSER $UNIT_DIR"
QUADLET_UNIT_DIRS="$quadlet_tmpdir" run $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" assert $status -eq 0 "Failed to convert quadlet file: $sourcefile"
is "$output" "" "quadlet should report no errors" is "$output" "" "quadlet should report no errors"

2
test/system/helpers.bash
View File

@ -2,7 +2,7 @@
# Podman command to run; may be podman-remote # Podman command to run; may be podman-remote
PODMAN=${PODMAN:-podman} PODMAN=${PODMAN:-podman}
QUADLET=${QUADLET:-quadlet} QUADLET=${QUADLET:-/usr/libexec/podman/quadlet}
# Standard image to use for most tests # Standard image to use for most tests
PODMAN_TEST_IMAGE_REGISTRY=${PODMAN_TEST_IMAGE_REGISTRY:-"quay.io"} PODMAN_TEST_IMAGE_REGISTRY=${PODMAN_TEST_IMAGE_REGISTRY:-"quay.io"}