openclaw/discrawl
openclaw/discrawl
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 4 Wiki Activity

test: relax signal cancellation race expectation

Browse Source
This commit is contained in:
Peter Steinberger 2026-05-03 12:10:35 +01:00
parent 2e155ba97c
commit 2d6de140d9
No known key found for this signature in database
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/discrawl/main_test.go
View File

@ -1,6 +1,7 @@
package main
import (
"bytes"
"errors"
"fmt"
"os"
@ -78,7 +79,11 @@ func TestMainCancelsWatchOnSIGTERM(t *testing.T) {
}
cmd := exec.CommandContext(t.Context(), exe, "-test.run=TestMainCancelsWatchOnSIGTERM")
cmd.Env = append(os.Environ(), "DISCRAWL_MAIN_SIGNAL_CHILD=1")
if err := cmd.Run(); err != nil {
output, err := cmd.CombinedOutput()
if isContextCanceledExit(err, output) {
return
}
if err != nil {
t.Fatalf("expected graceful SIGTERM cancellation, got %v", err)
}
}
@ -97,13 +102,9 @@ func TestMainCancelsWiretapImportOnSIGTERMWithoutCorruptingDB(t *testing.T) {
cmd := exec.CommandContext(t.Context(), exe, "-test.run=TestMainCancelsWiretapImportOnSIGTERMWithoutCorruptingDB")
cmd.Env = append(os.Environ(), "DISCRAWL_MAIN_IMPORT_SIGNAL_DIR="+dir)
output, err := cmd.CombinedOutput()
var exitErr *exec.ExitError
if !errors.As(err, &exitErr) {
if !isContextCanceledExit(err, output) {
t.Fatalf("expected context-canceled exit from SIGTERM, got err=%v output=%s", err, output)
}
if exitErr.ExitCode() != 1 {
t.Fatalf("expected graceful exit code 1, got %d output=%s", exitErr.ExitCode(), output)
}
ctx := t.Context()
s, err := store.Open(ctx, filepath.Join(dir, "discrawl.db"))
@ -168,6 +169,11 @@ func writeLargeWiretapCache(t *testing.T, path string, count int) {
}
}
func isContextCanceledExit(err error, output []byte) bool {
var exitErr *exec.ExitError
return errors.As(err, &exitErr) && exitErr.ExitCode() == 1 && bytes.Contains(output, []byte("context canceled"))
}
func requireNoError(t *testing.T, err error) {
t.Helper()
if err != nil {