Skip to content

Commit c9819c3

Browse files
authored
propagate timeouts in test suite (#209)
1 parent ff18c05 commit c9819c3

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

internal_workflow_testsuite.go

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,18 @@ func (env *testWorkflowEnvironmentImpl) executeActivity(
335335
panic(err)
336336
}
337337

338+
params := executeActivityParameters{
339+
ActivityType: ActivityType{Name: fnName},
340+
Input: input,
341+
ScheduleToCloseTimeoutSeconds: 600,
342+
StartToCloseTimeoutSeconds: 600,
343+
}
344+
338345
task := newTestActivityTask(
339346
defaultTestWorkflowID,
340347
defaultTestRunID,
341348
"0",
342-
fnName,
343-
input,
349+
params,
344350
)
345351

346352
// ensure activityFn is registered to defaultTestTaskList
@@ -624,8 +630,7 @@ func (env *testWorkflowEnvironmentImpl) ExecuteActivity(parameters executeActivi
624630
defaultTestWorkflowID,
625631
defaultTestRunID,
626632
activityInfo.activityID,
627-
parameters.ActivityType.Name,
628-
parameters.Input,
633+
parameters,
629634
)
630635

631636
taskHandler := env.newTestActivityTaskHandler(parameters.TaskListName)
@@ -965,20 +970,20 @@ func (env *testWorkflowEnvironmentImpl) newTestActivityTaskHandler(taskList stri
965970
return taskHandler
966971
}
967972

968-
func newTestActivityTask(workflowID, runID, activityID, activityType string, input []byte) *shared.PollForActivityTaskResponse {
973+
func newTestActivityTask(workflowID, runID, activityID string, params executeActivityParameters) *shared.PollForActivityTaskResponse {
969974
task := &shared.PollForActivityTaskResponse{
970975
WorkflowExecution: &shared.WorkflowExecution{
971976
WorkflowId: common.StringPtr(workflowID),
972977
RunId: common.StringPtr(runID),
973978
},
974979
ActivityId: common.StringPtr(activityID),
975980
TaskToken: []byte(activityID), // use activityID as TaskToken so we can map TaskToken in heartbeat calls.
976-
ActivityType: &shared.ActivityType{Name: common.StringPtr(activityType)},
977-
Input: input,
981+
ActivityType: &shared.ActivityType{Name: common.StringPtr(params.ActivityType.Name)},
982+
Input: params.Input,
978983
ScheduledTimestamp: common.Int64Ptr(time.Now().UnixNano()),
979-
ScheduleToCloseTimeoutSeconds: common.Int32Ptr(60),
984+
ScheduleToCloseTimeoutSeconds: common.Int32Ptr(params.ScheduleToCloseTimeoutSeconds),
980985
StartedTimestamp: common.Int64Ptr(time.Now().UnixNano()),
981-
StartToCloseTimeoutSeconds: common.Int32Ptr(60),
986+
StartToCloseTimeoutSeconds: common.Int32Ptr(params.StartToCloseTimeoutSeconds),
982987
}
983988
return task
984989
}

0 commit comments

Comments
 (0)