From f32bec9f4d3da9eaf821044141341fcc14834395 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Mon, 9 Mar 2026 00:41:00 +0800
Subject: [PATCH] test/e2e: optimize RunFrps/RunFrpc with process exit
 detection

Refactor Process to track subprocess lifecycle via a done channel,
replacing direct cmd.Wait() in Stop() to avoid double-Wait races.
RunFrps/RunFrpc now use select on the done channel instead of fixed
sleeps, allowing short-lived processes (verify, startup failures) to
return immediately while preserving existing timeout behavior for
long-running daemons.
---
 test/e2e/framework/process.go   | 10 ++++++++--
 test/e2e/pkg/process/process.go | 24 ++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/test/e2e/framework/process.go b/test/e2e/framework/process.go
index 6d21e3a2..e2c48427 100644
--- a/test/e2e/framework/process.go
+++ b/test/e2e/framework/process.go
@@ -76,7 +76,10 @@ func (f *Framework) RunFrps(args ...string) (*process.Process, string, error) {
 	if err != nil {
 		return p, p.Output(), err
 	}
-	time.Sleep(2 * time.Second)
+	select {
+	case <-p.Done():
+	case <-time.After(2 * time.Second):
+	}
 	return p, p.Output(), nil
 }
 
@@ -87,7 +90,10 @@ func (f *Framework) RunFrpc(args ...string) (*process.Process, string, error) {
 	if err != nil {
 		return p, p.Output(), err
 	}
-	time.Sleep(1500 * time.Millisecond)
+	select {
+	case <-p.Done():
+	case <-time.After(1500 * time.Millisecond):
+	}
 	return p, p.Output(), nil
 }
 
diff --git a/test/e2e/pkg/process/process.go b/test/e2e/pkg/process/process.go
index 04796225..ccff7ad0 100644
--- a/test/e2e/pkg/process/process.go
+++ b/test/e2e/pkg/process/process.go
@@ -12,6 +12,9 @@ type Process struct {
 	errorOutput *bytes.Buffer
 	stdOutput   *bytes.Buffer
 
+	done    chan struct{}
+	waitErr error
+
 	beforeStopHandler func()
 	stopped           bool
 }
@@ -27,6 +30,7 @@ func NewWithEnvs(path string, params []string, envs []string) *Process {
 	p := &Process{
 		cmd:    cmd,
 		cancel: cancel,
+		done:   make(chan struct{}),
 	}
 	p.errorOutput = bytes.NewBufferString("")
 	p.stdOutput = bytes.NewBufferString("")
@@ -36,7 +40,22 @@ func NewWithEnvs(path string, params []string, envs []string) *Process {
 }
 
 func (p *Process) Start() error {
-	return p.cmd.Start()
+	err := p.cmd.Start()
+	if err != nil {
+		p.waitErr = err
+		close(p.done)
+		return err
+	}
+	go func() {
+		p.waitErr = p.cmd.Wait()
+		close(p.done)
+	}()
+	return nil
+}
+
+// Done returns a channel that is closed when the process exits.
+func (p *Process) Done() <-chan struct{} {
+	return p.done
 }
 
 func (p *Process) Stop() error {
@@ -50,7 +69,8 @@ func (p *Process) Stop() error {
 		p.beforeStopHandler()
 	}
 	p.cancel()
-	return p.cmd.Wait()
+	<-p.done
+	return p.waitErr
 }
 
 func (p *Process) ErrorOutput() string {