Fix cancel test

hephbuild · Mar 17, 2024 · 42547c8 · 42547c8
1 parent 116c176
commit 42547c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/worker2/action_test.go b/worker2/action_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"github.com/stretchr/testify/assert"
 	"testing"
-	"time"
 )
 
 func TestExecSimple(t *testing.T) {
@@ -191,6 +190,8 @@ func TestExecCancel(t *testing.T) {
 		},
 	}
 
+	errCh := a.ErrorCh()
+
 	e := NewEngine()
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -200,10 +201,13 @@ func TestExecCancel(t *testing.T) {
 
 	e.Schedule(a)
 
-	time.Sleep(time.Second)
 	cancel()
 
 	e.Wait()
+
+	err := <-errCh
+
+	assert.ErrorIs(t, err, context.Canceled)
 }
 
 func TestExecDeps(t *testing.T) {

diff --git a/worker2/engine.go b/worker2/engine.go
@@ -274,7 +274,8 @@ func (e *Execution) Start(ctx context.Context) error {
 		e.suspendCh = make(chan struct{})
 
 		go func() {
-			e.errCh <- e.safeExec(ctx)
+			err := e.safeExec(ctx)
+			e.errCh <- err
 		}()
 	} else {
 		e.resumeAckCh <- struct{}{}