refactor: Introduce waitForProcessState helper in tests and refactor process state management to use stateMtx consistently and return state copies.

Author: F1bonacc1

src/app/process.go

@@ -37,7 +37,6 @@ const (
 type Process struct {
 	sync.Mutex
 	globalEnv            []string
-	confMtx              sync.Mutex
 	procConf             *types.ProcessConfig
 	procState            *types.ProcessState
 	stateMtx             sync.Mutex
@@ -780,7 +779,8 @@ func (p *Process) getState() *types.ProcessState {
 	p.updateProcState()
 	p.stateMtx.Lock()
 	defer p.stateMtx.Unlock()
-	return p.procState
+	stateCopy := *p.procState
+	return &stateCopy
 }
 
 type filterFn func(*types.ProcessState)
@@ -819,7 +819,7 @@ func (p *Process) GetPty() *os.File {
 func (p *Process) onStateChange(state string) {
 	switch state {
 	case types.ProcessStateSkipped:
-		p.setExitCode(1)
+		p.setExitCodeLocked(1)
 	case types.ProcessStateRestarting:
 		fallthrough
 	case types.ProcessStateLaunching:
@@ -1018,20 +1018,25 @@ func (p *Process) logOpenPort(label string, port uint16) {
 }
 
 func (p *Process) getExitCode() int {
-	defer p.confMtx.Unlock()
-	p.confMtx.Lock()
+	p.stateMtx.Lock()
+	defer p.stateMtx.Unlock()
 	return p.procState.ExitCode
 }
 
 func (p *Process) setExitCode(code int) {
-	defer p.confMtx.Unlock()
-	p.confMtx.Lock()
+	p.stateMtx.Lock()
+	defer p.stateMtx.Unlock()
+	p.procState.ExitCode = code
+}
+
+// setExitCodeLocked sets the exit code when stateMtx is already held.
+func (p *Process) setExitCodeLocked(code int) {
 	p.procState.ExitCode = code
 }
 
 func (p *Process) setProcHealth(health string) {
-	defer p.confMtx.Unlock()
-	p.confMtx.Lock()
+	p.stateMtx.Lock()
+	defer p.stateMtx.Unlock()
 	p.procState.Health = health
 }
 

src/app/system_test.go

@@ -21,6 +21,24 @@ import (
 	"github.com/f1bonacc1/process-compose/src/types"
 )
 
+func waitForProcessState(t *testing.T, runner *ProjectRunner, name string, wantStatus string, timeout time.Duration) {
+	t.Helper()
+	deadline := time.Now().Add(timeout)
+	for time.Now().Before(deadline) {
+		state, err := runner.GetProcessState(name)
+		if err != nil {
+			t.Error(err.Error())
+			return
+		}
+		if state.Status == wantStatus {
+			return
+		}
+		time.Sleep(50 * time.Millisecond)
+	}
+	state, _ := runner.GetProcessState(name)
+	t.Errorf("process %s: want %s, got %s (after %v)", name, wantStatus, state.Status, timeout)
+}
+
 func getFixtures() []string {
 	matches, err := filepath.Glob("../../fixtures/process-compose-*.yaml")
 	if err != nil {
@@ -611,14 +629,8 @@ func TestSystem_TestProcShutDownNoRestart(t *testing.T) {
 		return
 	}
 
-	time.Sleep(100 * time.Millisecond)
-	state, err = runner.GetProcessState(restarting)
-	if err != nil {
-		t.Error(err.Error())
-		return
-	}
-	if state.Status != types.ProcessStateCompleted {
-		t.Errorf("process %s want %s got %s", restarting, types.ProcessStateCompleted, state.Status)
+	waitForProcessState(t, runner, restarting, types.ProcessStateCompleted, 5*time.Second)
+	if t.Failed() {
 		return
 	}
 	state, err = runner.GetProcessState(notRestarting)
@@ -636,16 +648,7 @@ func TestSystem_TestProcShutDownNoRestart(t *testing.T) {
 		return
 	}
 
-	time.Sleep(100 * time.Millisecond)
-	state, err = runner.GetProcessState(notRestarting)
-	if err != nil {
-		t.Error(err.Error())
-		return
-	}
-	if state.Status != types.ProcessStateCompleted {
-		t.Errorf("process %s is running", notRestarting)
-		return
-	}
+	waitForProcessState(t, runner, notRestarting, types.ProcessStateCompleted, 5*time.Second)
 }
 func TestSystem_TestReadyLine(t *testing.T) {
 	proc1 := "proc1"