Skip to content

Commit 488c077

Browse files
authored
Merge pull request #4260 from kolyshkin/tty-timeout
tests/int/tty: increase the timeout
2 parents c9f624e + 6bf1d3a commit 488c077

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

tests/integration/tty.bats

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,13 @@ function teardown() {
171171
EOF
172172
)
173173

174-
# run the exec
174+
# Run the detached exec.
175175
runc exec -t --pid-file pid.txt -d --console-socket "$CONSOLE_SOCKET" -p <(echo "$tty_info_with_consize_size") test_busybox
176176
[ "$status" -eq 0 ]
177-
178-
# check the pid was generated
179177
[ -e pid.txt ]
180178

181-
# wait for the process to finish
182-
timeout 5 tail --pid="$(head -n 1 pid.txt)" -f /dev/null
179+
# Wait for the exec to finish.
180+
wait_pids_gone 100 0.5 "$(cat pid.txt)"
183181

184182
tty_info=$(
185183
cat <<EOF

0 commit comments

Comments
 (0)