Fix testsuite race condition during activity retry (#914)

cadence-workflow · Dec 18, 2019 · 19df4b8 · 19df4b8
1 parent 8b5a4e5
commit 19df4b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/internal/internal_workflow_testsuite.go b/internal/internal_workflow_testsuite.go
@@ -987,7 +987,9 @@ func (env *testWorkflowEnvironmentImpl) executeActivityWithRetryForTest(
 			if backoff > 0 {
 				// need a retry
 				waitCh := make(chan struct{})
-				env.postCallback(func() { env.runningCount-- }, false)
+
+				// register the delayed call back first, otherwise other timers may be fired before the retry timer
+				// is enqueued.
 				env.registerDelayedCallback(func() {
 					env.runningCount++
 					task.Attempt = common.Int32Ptr(task.GetAttempt() + 1)
@@ -997,6 +999,7 @@ func (env *testWorkflowEnvironmentImpl) executeActivityWithRetryForTest(
 					}
 					close(waitCh)
 				}, backoff)
+				env.postCallback(func() { env.runningCount-- }, false)
 
 				<-waitCh
 				continue

diff --git a/internal/internal_workflow_testsuite_test.go b/internal/internal_workflow_testsuite_test.go
@@ -2152,6 +2152,10 @@ func (s *WorkflowTestSuiteUnitTest) Test_ActivityRetry() {
 	RegisterWorkflow(workflowFn)
 	RegisterActivity(activityFailedFn)
 	RegisterActivity(activityFn)
+
+	// set a workflow timeout timer to test
+	// if the timer will fire during activity retry
+	env.SetWorkflowTimeout(10 * time.Second)
 	env.ExecuteWorkflow(workflowFn)
 
 	s.True(env.IsWorkflowCompleted())