Skip to content

Commit

Permalink
Fixed bug that delay was in seconds instead of specified milliseconds (
Browse files Browse the repository at this point in the history
  • Loading branch information
MaartendeKruijf authored Jul 26, 2024
1 parent 90e1f3d commit 8b62b16
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion internal/decomposer/decomposer.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func (decomposer *Decomposer) ExecuteStep(step cacao.Step, scopeVariables cacao.
log.Debug("Executing step type ", step.Type)

log.Trace("Delay is set to: ", step.Delay)
decomposer.time.Sleep(t.Duration(step.Delay) * t.Second)
decomposer.time.Sleep(t.Duration(step.Delay) * t.Millisecond)

// Combine parent scope and Step variables
variables := cacao.NewVariables()
Expand Down
20 changes: 10 additions & 10 deletions test/unittest/decomposer/decomposer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func TestExecutePlaybook(t *testing.T) {
}

mock_reporter.On("ReportWorkflowStart", executionId, playbook).Return()
mock_time.On("Sleep", time.Second*10).Return()
mock_time.On("Sleep", time.Millisecond*10).Return()
mock_reporter.On("ReportWorkflowEnd", executionId, playbook, nil).Return()
mock_action_executor.On("Execute", metaStep1, playbookStepMetadata).Return(cacao.NewVariables(cacao.Variable{Name: "return", Value: "value"}), nil)

Expand Down Expand Up @@ -246,7 +246,7 @@ func TestExecutePlaybookMultiStep(t *testing.T) {
}

mock_reporter.On("ReportWorkflowStart", executionId, playbook).Return()
mock_time.On("Sleep", time.Second*0).Return()
mock_time.On("Sleep", time.Millisecond*0).Return()
mock_reporter.On("ReportWorkflowEnd", executionId, playbook, nil).Return()
mock_action_executor.On("Execute", metaStep1, playbookStepMetadata1).Return(cacao.NewVariables(firstResult), nil)

Expand Down Expand Up @@ -337,7 +337,7 @@ func TestExecuteEmptyMultiStep(t *testing.T) {
uuid_mock2.On("New").Return(id)

mock_reporter.On("ReportWorkflowStart", id, playbook).Return()
mock_time.On("Sleep", time.Second*0).Return()
mock_time.On("Sleep", time.Millisecond*0).Return()
mock_reporter.On("ReportWorkflowEnd", id, playbook, errors.New("empty success step")).Return()

returnedId, err := decomposer2.Execute(playbook)
Expand Down Expand Up @@ -400,7 +400,7 @@ func TestExecuteIllegalMultiStep(t *testing.T) {
id, _ := uuid.Parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
uuid_mock2.On("New").Return(id)
mock_reporter.On("ReportWorkflowStart", id, playbook).Return()
mock_time.On("Sleep", time.Second*0).Return()
mock_time.On("Sleep", time.Millisecond*0).Return()
mock_reporter.On("ReportWorkflowEnd", id, playbook, errors.New("empty success step")).Return()

returnedId, err := decomposer2.Execute(playbook)
Expand Down Expand Up @@ -460,7 +460,7 @@ func TestExecutePlaybookAction(t *testing.T) {

uuid_mock.On("New").Return(executionId)
mock_reporter.On("ReportWorkflowStart", executionId, playbook).Return()
mock_time.On("Sleep", time.Second*0).Return()
mock_time.On("Sleep", time.Millisecond*0).Return()
mock_reporter.On("ReportWorkflowEnd", executionId, playbook, nil).Return()

mock_playbook_action_executor.On("Execute",
Expand Down Expand Up @@ -611,7 +611,7 @@ func TestExecuteIfCondition(t *testing.T) {

uuid_mock.On("New").Return(executionId)
mock_reporter.On("ReportWorkflowStart", executionId, playbook).Return()
mock_time.On("Sleep", time.Second*0).Return()
mock_time.On("Sleep", time.Millisecond*0).Return()

mock_condition_executor.On("Execute",
metaStepIf,
Expand All @@ -627,7 +627,7 @@ func TestExecuteIfCondition(t *testing.T) {
}

metaStepTrue := execution.Metadata{ExecutionId: executionId, PlaybookId: "test", StepId: stepTrue.ID}
mock_time.On("Sleep", time.Second*0).Return()
mock_time.On("Sleep", time.Millisecond*0).Return()

mock_action_executor.On("Execute",
metaStepTrue,
Expand All @@ -642,7 +642,7 @@ func TestExecuteIfCondition(t *testing.T) {
}

metaStepCompletion := execution.Metadata{ExecutionId: executionId, PlaybookId: "test", StepId: stepCompletion.ID}
mock_time.On("Sleep", time.Second*0).Return()
mock_time.On("Sleep", time.Millisecond*0).Return()

mock_action_executor.On("Execute",
metaStepCompletion,
Expand Down Expand Up @@ -705,7 +705,7 @@ func TestDelayStepExecution(t *testing.T) {
Variables: cacao.NewVariables(expectedVariables),
}

mock_time.On("Sleep", time.Second*10).Return()
mock_time.On("Sleep", time.Millisecond*10).Return()
mock_action_executor.On("Execute", metaStep1, playbookStepMetadata).Return(cacao.NewVariables(cacao.Variable{Name: "return", Value: "value"}), nil)

_, err := decomposer.ExecuteStep(step1, cacao.NewVariables(expectedVariables))
Expand Down Expand Up @@ -759,7 +759,7 @@ func TestDelayStepNegativeTimeExecution(t *testing.T) {
Variables: cacao.NewVariables(expectedVariables),
}

mock_time.On("Sleep", time.Second*-10).Return()
mock_time.On("Sleep", time.Millisecond*-10).Return()
mock_action_executor.On("Execute", metaStep1, playbookStepMetadata).Return(cacao.NewVariables(cacao.Variable{Name: "return", Value: "value"}), nil)

_, err := decomposer.ExecuteStep(step1, cacao.NewVariables(expectedVariables))
Expand Down

0 comments on commit 8b62b16

Please sign in to comment.