From 341eb5b63b8d4bc013671c05798b191a3b619e06 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Wed, 13 May 2026 17:18:47 +0200 Subject: [PATCH] chore(xray): minor cleanups to graceful-shutdown follow-ups for #4259 - Remove unreachable p.done == nil guard in waitForExit (set in startCommand) - Bump TestStopWaitsForGracefulExit margin to 180ms (helper sleeps 200ms) - 0644 -> 0o644 for Go style --- xray/process.go | 4 ---- xray/process_test.go | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/xray/process.go b/xray/process.go index f1a1400a..6be60ac6 100644 --- a/xray/process.go +++ b/xray/process.go @@ -436,10 +436,6 @@ func (p *process) Stop() error { } func (p *process) waitForExit(timeout time.Duration) error { - if p.done == nil { - return nil - } - timer := time.NewTimer(timeout) defer timer.Stop() diff --git a/xray/process_test.go b/xray/process_test.go index e4b2689b..12d01500 100644 --- a/xray/process_test.go +++ b/xray/process_test.go @@ -24,7 +24,7 @@ func TestStopWaitsForGracefulExit(t *testing.T) { if err := p.Stop(); err != nil { t.Fatalf("Stop: %v", err) } - if elapsed := time.Since(start); elapsed < 150*time.Millisecond { + if elapsed := time.Since(start); elapsed < 180*time.Millisecond { t.Fatalf("Stop returned before child exited; elapsed=%s", elapsed) } if p.IsRunning() { @@ -156,7 +156,7 @@ func markProcessHelperReady(t *testing.T) { if readyPath == "" { t.Fatal("XRAY_PROCESS_READY is not set") } - if err := os.WriteFile(readyPath, []byte("ready"), 0644); err != nil { + if err := os.WriteFile(readyPath, []byte("ready"), 0o644); err != nil { t.Fatalf("write helper ready file: %v", err) } }