TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/containerboot: avoid leaking bash scripts after test runs

Browse Source 
The test was sending SIGKILL to containerboot, which results in no
signal propagation down to the bash script that is running as a child
process, thus it leaks.

Minor changes to the test daemon script, so that it cleans up the socket
that it creates on exit, and spawns fewer processes.

Fixes tailscale/corp#14833
Signed-off-by: James Tucker <james@tailscale.com>
This commit is contained in:
James Tucker 2023-09-21 13:02:36 -07:00 committed by James Tucker
parent c5006f143f
commit a82a74f2cf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/containerboot/main_test.go
View File

@ -689,7 +689,7 @@ type phase struct {
t.Fatalf("starting containerboot: %v", err) t.Fatalf("starting containerboot: %v", err)
} }
defer func() { defer func() {
cmd.Process.Signal(unix.SIGKILL) cmd.Process.Signal(unix.SIGTERM)
cmd.Process.Wait() cmd.Process.Wait()
}() }()

5
cmd/containerboot/test_tailscaled.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# This is a fake tailscale CLI that records its arguments, symlinks a # This is a fake tailscale daemon that records its arguments, symlinks a
# fake LocalAPI socket into place, and does nothing until terminated. # fake LocalAPI socket into place, and does nothing until terminated.
# #
# It is used by main_test.go to test the behavior of containerboot. # It is used by main_test.go to test the behavior of containerboot.
@ -33,5 +33,6 @@ if [[ -z "$socket" ]]; then
fi fi
ln -s "$TS_TEST_SOCKET" "$socket" ln -s "$TS_TEST_SOCKET" "$socket"
trap 'rm -f "$socket"' EXIT
while true; do sleep 1; done while sleep 10; do :; done