opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18517 from edsantiago/quadlet_timeout

Browse Source 
system tests: timeoutize quadlet, systemd
This commit is contained in:
OpenShift Merge Robot
2023-05-10 06:03:03 -04:00
committed by GitHub
parent 7a5daa0df3 d24bec0d03
commit 3c781c4cda
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,9 @@ function run_quadlet() {
cp $sourcefile $quadlet_tmpdir/ cp $sourcefile $quadlet_tmpdir/
echo "$_LOG_PROMPT $QUADLET $_DASHUSER $UNIT_DIR" echo "$_LOG_PROMPT $QUADLET $_DASHUSER $UNIT_DIR"
QUADLET_UNIT_DIRS="$quadlet_tmpdir" run $QUADLET $_DASHUSER $UNIT_DIR QUADLET_UNIT_DIRS="$quadlet_tmpdir" run \
timeout --foreground -v --kill=10 $PODMAN_TIMEOUT \
$QUADLET $_DASHUSER $UNIT_DIR
echo "$output" 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"

6
test/system/helpers.systemd.bash
View File

@ -22,15 +22,15 @@ fi
mkdir -p $UNIT_DIR mkdir -p $UNIT_DIR
systemctl() { systemctl() {
command systemctl $_DASHUSER "$@" timeout --foreground -v --kill=10 $PODMAN_TIMEOUT systemctl $_DASHUSER "$@"
} }
journalctl() { journalctl() {
command journalctl $_DASHUSER "$@" timeout --foreground -v --kill=10 $PODMAN_TIMEOUT journalctl $_DASHUSER "$@"
} }
systemd-run() { systemd-run() {
command systemd-run $_DASHUSER "$@"; timeout --foreground -v --kill=10 $PODMAN_TIMEOUT systemd-run $_DASHUSER "$@";
} }
install_kube_template() { install_kube_template() {