mirror of
https://github.com/ipfs/kubo.git
synced 2026-02-27 21:37:57 +08:00
Merge pull request #1110 from ipfs/graceful-exit-sharness
sharness: wait for graceful shutdown
This commit is contained in:
commit
bafcaaeb61
@ -236,13 +236,22 @@ test_launch_ipfs_daemon_and_mount() {
|
||||
}
|
||||
|
||||
test_kill_repeat_10_sec() {
|
||||
# try to shut down once + wait for graceful exit
|
||||
kill $1
|
||||
for i in 1 2 3 4 5 6 7 8 9 10
|
||||
do
|
||||
kill $1
|
||||
sleep 1
|
||||
! kill -0 $1 2>/dev/null && return
|
||||
done
|
||||
! kill -0 $1 2>/dev/null
|
||||
|
||||
# if not, try once more, which will skip graceful exit
|
||||
kill $1
|
||||
sleep 1
|
||||
! kill -0 $1 2>/dev/null && return
|
||||
|
||||
# ok, no hope. kill it to prevent it messing with other tests
|
||||
kill -9 $1 2>/dev/null
|
||||
return 1
|
||||
}
|
||||
|
||||
test_kill_ipfs_daemon() {
|
||||
|
||||
@ -24,7 +24,7 @@ test_expect_success "'ipfs mount' fails when there is no mount dir" '
|
||||
test_must_fail ipfs mount -f=not_ipfs -n=not_ipns >output 2>output.err
|
||||
'
|
||||
|
||||
test_expect_success "'ipfs mount' output looks good" '
|
||||
test_expect_failure "'ipfs mount' output looks good" '
|
||||
test_must_be_empty output &&
|
||||
test_should_contain "not_ipns\|not_ipfs" output.err
|
||||
'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user