Apply suggestions from code review

Co-authored-by: Josh van Leeuwen <[email protected]>
Signed-off-by: Cassie Coyle <[email protected]>

cron/cron_test.go

@@ -49,13 +49,11 @@ func Test_Run(t *testing.T) {
 		cron := cronI.(*cron)
 
 		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
 		errCh1 := make(chan error)
 		errCh2 := make(chan error)
 
 		go func() {
 			errCh1 <- cronI.Run(ctx)
-			close(errCh1)
 		}()
 
 		select {
@@ -66,7 +64,6 @@ func Test_Run(t *testing.T) {
 
 		go func() {
 			errCh2 <- cronI.Run(ctx)
-			close(errCh2)
 		}()
 
 		select {
@@ -112,7 +109,6 @@ func Test_Run(t *testing.T) {
 
 		go func() {
 			errCh <- cronI.Run(ctx)
-			close(errCh)
 		}()
 
 		// wait until ready

internal/engine/engine_test.go

@@ -118,25 +118,16 @@ func Test_Run(t *testing.T) {
 		require.NoError(t, err)
 		require.NotNil(t, engine)
 
-		ctx1, cancel1 := context.WithCancel(context.Background())
-		defer cancel1()
-
-		startedCh := make(chan struct{})
-		go func() {
-			close(startedCh)
-			_ = engine.Run(ctx1)
-		}()
-		<-startedCh // ensure engine starts
-
-		ctx2, cancel2 := context.WithCancel(context.Background())
-		defer cancel2()
+		ctx, cancel := context.WithCancel(context.Background())
+		t.Cleanup(cancel)
 
-		err = engine.Run(ctx2)
-		require.Error(t, err)
-		assert.Contains(t, err.Error(), "engine is already running")
+		errCh := make(chan error)
+		go func() { errCh <- engine.Run(ctx) }()
+		go func() { errCh <- engine.Run(ctx) }()
+		require.Error(t, <-errCh)
+		cancel()
+		require.NoError(t, <-errCh)
 
-		// Cancel the first Run to allow cleanup
-		cancel1()
 	})
 }