Merge pull request #1101 from petr-muller/ocpbugs-22442-test-run-graph-mid-task-cancellation-flake

NO-JIRA: task graph: test speedup and code cleaup

Author: openshift-merge-bot[bot]

pkg/payload/task_graph.go

@@ -514,9 +514,8 @@ func RunGraph(ctx context.Context, graph *TaskGraph, maxParallelism int, fn func
 				inflight--
 			case <-ctx.Done():
 				select {
-				case runTask := <-workCh: // workers canceled, so remove any work from the queue ourselves
+				case <-workCh: // workers canceled, so remove any work from the queue ourselves
 					inflight--
-					submitted[runTask.index] = false
 				default:
 				}
 			}

pkg/payload/task_graph_test.go

@@ -949,7 +949,6 @@ func TestRunGraph(t *testing.T) {
 			callbacks: map[string]callbackFn{
 				"a": func(t *testing.T, name string, ctx context.Context, cancelFn func()) error {
 					cancelFn()
-					time.Sleep(time.Second)
 					return nil
 				},
 				"*": func(t *testing.T, name string, ctx context.Context, cancelFn func()) error {