diff --git a/common/enums/defaults.go b/common/enums/defaults.go index 30c1ad76291..af535705a7f 100644 --- a/common/enums/defaults.go +++ b/common/enums/defaults.go @@ -75,7 +75,7 @@ func SetDefaultContinueAsNewInitiator(f *enumspb.ContinueAsNewInitiator) { func SetDefaultResetReapplyType(f *enumspb.ResetReapplyType) { if *f == enumspb.RESET_REAPPLY_TYPE_UNSPECIFIED { - *f = enumspb.RESET_REAPPLY_TYPE_SIGNAL + *f = enumspb.RESET_REAPPLY_TYPE_ALL_ELIGIBLE } } diff --git a/tests/reset_workflow.go b/tests/reset_workflow.go index ac1b28ba18e..b87fe6ed975 100644 --- a/tests/reset_workflow.go +++ b/tests/reset_workflow.go @@ -219,6 +219,14 @@ func (s *FunctionalSuite) TestResetWorkflow() { s.Equal(we.RunId, descResp.WorkflowExecutionInfo.GetFirstRunId()) } +func (s *FunctionalSuite) TestResetWorkflow_ExcludeNoneReapplyDefault() { + t := resetTest{ + FunctionalSuite: s, + tv: testvars.New(s.T()), + } + t.run() +} + func (s *FunctionalSuite) TestResetWorkflow_ExcludeNoneReapplyAll() { t := resetTest{ FunctionalSuite: s, diff --git a/tests/xdc/history_replication_signals_and_updates_test.go b/tests/xdc/history_replication_signals_and_updates_test.go index 116e1c3071d..c22879fd2da 100644 --- a/tests/xdc/history_replication_signals_and_updates_test.go +++ b/tests/xdc/history_replication_signals_and_updates_test.go @@ -935,7 +935,6 @@ func (c *hrsuTestCluster) resetWorkflow(ctx context.Context, workflowTaskFinishE WorkflowExecution: c.t.tv.WorkflowExecution(), Reason: "reset", WorkflowTaskFinishEventId: workflowTaskFinishEventId, - ResetReapplyType: enumspb.RESET_REAPPLY_TYPE_ALL_ELIGIBLE, }) c.t.s.NoError(err) return resp.RunId