From 6bf1d3adbecc5d429a02d13cdd98c87021f373dd Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 25 Apr 2024 18:13:25 -0700 Subject: [PATCH] tests/int/tty: increase the timeout Earlier, commit fce8dd4d already increased this timeout from 1 to 5 seconds. Yet, I just saw this timeout being hit in actuated-arm CI. Increase the timeout again, this time from 5 to 50 (100 * 0.5) seconds. Also, use wait_pids_gone, and improve some comments. Signed-off-by: Kir Kolyshkin --- tests/integration/tty.bats | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/integration/tty.bats b/tests/integration/tty.bats index 6f008e5f7ab..c95c19a1eea 100644 --- a/tests/integration/tty.bats +++ b/tests/integration/tty.bats @@ -171,15 +171,13 @@ function teardown() { EOF ) - # run the exec + # Run the detached exec. runc exec -t --pid-file pid.txt -d --console-socket "$CONSOLE_SOCKET" -p <(echo "$tty_info_with_consize_size") test_busybox [ "$status" -eq 0 ] - - # check the pid was generated [ -e pid.txt ] - # wait for the process to finish - timeout 5 tail --pid="$(head -n 1 pid.txt)" -f /dev/null + # Wait for the exec to finish. + wait_pids_gone 100 0.5 "$(cat pid.txt)" tty_info=$( cat <