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

system tests: timeoutize quadlet, systemd 

Run $QUADLET and all systemctl/journalctl commands using 'timeout'.
Nothing should ever, ever take more than the default 2 minutes.

Followup to #18514, in which quadlet tests are found to be
taking 9-10 minutes.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2023-05-09 07:02:05 -06:00
parent d49a537b8f
commit d24bec0d03
2 changed files with 6 additions and 4 deletions
Show Stats 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() {