Merge branch 'master' into release/issue-43

Lexcorp3439 · Nov 28, 2022 · dc1fe20 · dc1fe20
2 parents 9940a9e + ff31572
commit dc1fe20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/framework/core/common/step_context.go b/pkg/framework/core/common/step_context.go
@@ -154,6 +154,7 @@ func (ctx *stepCtx) WithNewStep(stepName string, step func(ctx provider.StepCtx)
 	defer ctx.currentStep.WithChild(newCtx.CurrentStep())
 	defer func() {
 		r := recover()
+		newCtx.WG().Wait()
 		newCtx.CurrentStep().Finish()
 		if r != nil {
 			ctxName := newCtx.ExecutionContextName()
@@ -172,7 +173,6 @@ func (ctx *stepCtx) WithNewAsyncStep(stepName string, step func(ctx provider.Ste
 		wg = ctx.parentStep.WG()
 	}
 	wg.Add(1)
-	defer wg.Wait()
 
 	go func() {
 		defer wg.Done()

diff --git a/pkg/framework/core/common/steps.go b/pkg/framework/core/common/steps.go
@@ -15,6 +15,7 @@ func (c *Common) WithNewStep(stepName string, step func(ctx provider.StepCtx), p
 	defer c.Step(stCtx.CurrentStep())
 	defer func() {
 		r := recover()
+		stCtx.WG().Wait()
 		stCtx.CurrentStep().Finish()
 		if r != nil {
 			ctxName := c.ExecutionContext().GetName()