diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/DoWhileSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/DoWhileSpec.groovy index 51de75a43..4f1aeb684 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/DoWhileSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/DoWhileSpec.groovy @@ -739,7 +739,7 @@ class DoWhileSpec extends AbstractSpecification { def persistedTaskDefinition = workflowTestUtil.getPersistedTaskDefinition(taskName).get() def modifiedTaskDefinition = new TaskDef(persistedTaskDefinition.name, persistedTaskDefinition.description, persistedTaskDefinition.ownerEmail, 0, persistedTaskDefinition.timeoutSeconds, - persistedTaskDefinition.responseTimeoutSeconds) + persistedTaskDefinition.responseTimeoutSeconds,persistedTaskDefinition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTaskDefinition) when: "A do while workflow is started" @@ -876,7 +876,7 @@ class DoWhileSpec extends AbstractSpecification { def persistedTaskDefinition = workflowTestUtil.getPersistedTaskDefinition(taskName).get() def modifiedTaskDefinition = new TaskDef(persistedTaskDefinition.name, persistedTaskDefinition.description, persistedTaskDefinition.ownerEmail, 1, persistedTaskDefinition.timeoutSeconds, - persistedTaskDefinition.responseTimeoutSeconds) + persistedTaskDefinition.responseTimeoutSeconds,persistedTaskDefinition.totalTimeoutSeconds) modifiedTaskDefinition.setRetryDelaySeconds(0) metadataService.updateTaskDef(modifiedTaskDefinition) diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/DynamicForkJoinSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/DynamicForkJoinSpec.groovy index 891cf44c7..b1382e29f 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/DynamicForkJoinSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/DynamicForkJoinSpec.groovy @@ -153,7 +153,8 @@ class DynamicForkJoinSpec extends AbstractSpecification { def persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, - persistedTask2Definition.timeoutSeconds, persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.timeoutSeconds, persistedTask2Definition.responseTimeoutSeconds, + persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) when: " a dynamic fork join workflow is started" @@ -237,7 +238,8 @@ class DynamicForkJoinSpec extends AbstractSpecification { def persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, - persistedTask2Definition.timeoutSeconds, persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.timeoutSeconds, persistedTask2Definition.responseTimeoutSeconds, + persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) when: " a dynamic fork join workflow is started" @@ -390,7 +392,8 @@ class DynamicForkJoinSpec extends AbstractSpecification { def persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, - persistedTask2Definition.timeoutSeconds, persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.timeoutSeconds, persistedTask2Definition.responseTimeoutSeconds, + persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) when: "the dynamic fork join workflow is started" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ExternalPayloadStorageSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ExternalPayloadStorageSpec.groovy index 02d5658e7..7d0bbac50 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ExternalPayloadStorageSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ExternalPayloadStorageSpec.groovy @@ -563,7 +563,7 @@ class ExternalPayloadStorageSpec extends AbstractSpecification { def persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 2, persistedTask2Definition.timeoutSeconds, - persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.responseTimeoutSeconds,persistedTask2Definition.totalTimeoutSeconds) modifiedTask2Definition.setRetryDelaySeconds(0) metadataService.updateTaskDef(modifiedTask2Definition) diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ForkJoinSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ForkJoinSpec.groovy index 7600a648e..12cca6200 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ForkJoinSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ForkJoinSpec.groovy @@ -185,7 +185,8 @@ class ForkJoinSpec extends AbstractSpecification { def persistedIntegrationTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedIntegrationTask2Definition = new TaskDef(persistedIntegrationTask2Definition.name, persistedIntegrationTask2Definition.description, persistedIntegrationTask2Definition.ownerEmail, 0, - 0, persistedIntegrationTask2Definition.responseTimeoutSeconds) + 0, persistedIntegrationTask2Definition.responseTimeoutSeconds, + persistedIntegrationTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedIntegrationTask2Definition) when: "A fork join workflow is started" @@ -276,7 +277,8 @@ class ForkJoinSpec extends AbstractSpecification { def persistedIntegrationTask1Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_1').get() def modifiedIntegrationTask1Definition = new TaskDef(persistedIntegrationTask1Definition.name, persistedIntegrationTask1Definition.description, persistedIntegrationTask1Definition.ownerEmail, 0, - 0, persistedIntegrationTask1Definition.responseTimeoutSeconds) + 0, persistedIntegrationTask1Definition.responseTimeoutSeconds, + persistedIntegrationTask1Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedIntegrationTask1Definition) when: "A fork join workflow is started" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRerunSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRerunSpec.groovy index 8496eef94..b10c8b89b 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRerunSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRerunSpec.groovy @@ -65,7 +65,7 @@ class HierarchicalForkJoinSubworkflowRerunSpec extends AbstractSpecification { persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, persistedTask2Definition.timeoutSeconds, - persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.responseTimeoutSeconds, persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) and: "an existing workflow with subworkflow and registered definitions" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRestartSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRestartSpec.groovy index c50670bf0..207e92054 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRestartSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRestartSpec.groovy @@ -64,7 +64,7 @@ class HierarchicalForkJoinSubworkflowRestartSpec extends AbstractSpecification { persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, persistedTask2Definition.timeoutSeconds, - persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.responseTimeoutSeconds, persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) and: "an existing workflow with subworkflow and registered definitions" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRetrySpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRetrySpec.groovy index 916c34be8..196148ce5 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRetrySpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/HierarchicalForkJoinSubworkflowRetrySpec.groovy @@ -60,7 +60,7 @@ class HierarchicalForkJoinSubworkflowRetrySpec extends AbstractSpecification { persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, persistedTask2Definition.timeoutSeconds, - persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.responseTimeoutSeconds, persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) and: "an existing workflow with subworkflow and registered definitions" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/NestedForkJoinSubWorkflowSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/NestedForkJoinSubWorkflowSpec.groovy index 041bfbc67..000a25377 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/NestedForkJoinSubWorkflowSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/NestedForkJoinSubWorkflowSpec.groovy @@ -59,7 +59,7 @@ class NestedForkJoinSubWorkflowSpec extends AbstractSpecification { persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, persistedTask2Definition.timeoutSeconds, - persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.responseTimeoutSeconds, persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) and: "an existing workflow with subworkflow and registered definitions" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SimpleWorkflowSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SimpleWorkflowSpec.groovy index 1134078ac..e6ba26f69 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SimpleWorkflowSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SimpleWorkflowSpec.groovy @@ -160,7 +160,7 @@ class SimpleWorkflowSpec extends AbstractSpecification { def persistedTask1Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_1').get() def modifiedTask1Definition = new TaskDef(persistedTask1Definition.name, persistedTask1Definition.description, persistedTask1Definition.ownerEmail, 1, persistedTask1Definition.timeoutSeconds, - persistedTask1Definition.responseTimeoutSeconds) + persistedTask1Definition.responseTimeoutSeconds, persistedTask1Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask1Definition) def workflowDef = metadataService.getWorkflowDef(LINEAR_WORKFLOW_T1_T2, 1) @@ -360,7 +360,7 @@ class SimpleWorkflowSpec extends AbstractSpecification { def persistedTask1Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_1').get() def modifiedTaskDefinition = new TaskDef(persistedTask1Definition.name, persistedTask1Definition.description, persistedTask1Definition.ownerEmail, 0, persistedTask1Definition.timeoutSeconds, - persistedTask1Definition.responseTimeoutSeconds) + persistedTask1Definition.responseTimeoutSeconds, persistedTask1Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTaskDefinition) when: "Get the workflow definition associated with the simple workflow" @@ -438,7 +438,7 @@ class SimpleWorkflowSpec extends AbstractSpecification { def persistedTask1Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_1').get() def modifiedTaskDefinition = new TaskDef(persistedTask1Definition.name, persistedTask1Definition.description, persistedTask1Definition.ownerEmail, 0, persistedTask1Definition.timeoutSeconds, - persistedTask1Definition.responseTimeoutSeconds) + persistedTask1Definition.responseTimeoutSeconds, persistedTask1Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTaskDefinition) when: "Get the workflow definition associated with the simple workflow" @@ -537,7 +537,7 @@ class SimpleWorkflowSpec extends AbstractSpecification { def integrationTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTaskDefinition = new TaskDef(integrationTask2Definition.name, integrationTask2Definition.description, integrationTask2Definition.ownerEmail, 3, integrationTask2Definition.timeoutSeconds, - integrationTask2Definition.responseTimeoutSeconds) + integrationTask2Definition.responseTimeoutSeconds, integrationTask2Definition.totalTimeoutSeconds) modifiedTaskDefinition.retryDelaySeconds = 2 metadataService.updateTaskDef(modifiedTaskDefinition) @@ -614,7 +614,7 @@ class SimpleWorkflowSpec extends AbstractSpecification { def integrationTask1Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_1').get() def modifiedTaskDefinition = new TaskDef(integrationTask1Definition.name, integrationTask1Definition.description, integrationTask1Definition.ownerEmail, 1, integrationTask1Definition.timeoutSeconds, - integrationTask1Definition.responseTimeoutSeconds) + integrationTask1Definition.responseTimeoutSeconds, integrationTask1Definition.totalTimeoutSeconds) modifiedTaskDefinition.retryDelaySeconds = 0 metadataService.updateTaskDef(modifiedTaskDefinition) @@ -881,7 +881,7 @@ class SimpleWorkflowSpec extends AbstractSpecification { def integrationTask1Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_1').get() def modifiedTaskDefinition = new TaskDef(integrationTask1Definition.name, integrationTask1Definition.description, integrationTask1Definition.ownerEmail, 0, integrationTask1Definition.timeoutSeconds, - integrationTask1Definition.responseTimeoutSeconds) + integrationTask1Definition.responseTimeoutSeconds, integrationTask1Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTaskDefinition) def simpleWorkflowDefinition = metadataService.getWorkflowDef(LINEAR_WORKFLOW_T1_T2, 1) diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRerunSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRerunSpec.groovy index 8acbd1351..703d6feaa 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRerunSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRerunSpec.groovy @@ -54,7 +54,7 @@ class SubWorkflowRerunSpec extends AbstractSpecification { persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, persistedTask2Definition.timeoutSeconds, - persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.responseTimeoutSeconds, persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) and: "an existing workflow with subworkflow and registered definitions" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRestartSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRestartSpec.groovy index 88589291d..b65e5ad82 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRestartSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRestartSpec.groovy @@ -54,7 +54,7 @@ class SubWorkflowRestartSpec extends AbstractSpecification { persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, persistedTask2Definition.timeoutSeconds, - persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.responseTimeoutSeconds,persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) and: "an existing workflow with subworkflow and registered definitions" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRetrySpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRetrySpec.groovy index 17907d407..8da3d8092 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRetrySpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowRetrySpec.groovy @@ -55,7 +55,7 @@ class SubWorkflowRetrySpec extends AbstractSpecification { persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, persistedTask2Definition.timeoutSeconds, - persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.responseTimeoutSeconds, persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) and: "an existing workflow with subworkflow and registered definitions" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowSpec.groovy index c897c7ed8..c9b5ef69a 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SubWorkflowSpec.groovy @@ -307,7 +307,7 @@ class SubWorkflowSpec extends AbstractSpecification { def persistedTask2Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_2').get() def modifiedTask2Definition = new TaskDef(persistedTask2Definition.name, persistedTask2Definition.description, persistedTask2Definition.ownerEmail, 0, persistedTask2Definition.timeoutSeconds, - persistedTask2Definition.responseTimeoutSeconds) + persistedTask2Definition.responseTimeoutSeconds, persistedTask2Definition.totalTimeoutSeconds) metadataService.updateTaskDef(modifiedTask2Definition) and: "an existing workflow with subworkflow and registered definitions" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy index 4801ee26d..0f472188e 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy @@ -329,7 +329,7 @@ class WorkflowAndTaskConfigurationSpec extends AbstractSpecification { setup: "Register a task definition with retry policy on time out" def persistedTask1Definition = workflowTestUtil.getPersistedTaskDefinition('integration_task_1').get() def modifiedTaskDefinition = new TaskDef(persistedTask1Definition.name, persistedTask1Definition.description, - persistedTask1Definition.ownerEmail, 1, 1, 1) + persistedTask1Definition.ownerEmail, 1, 1, 1, 30) modifiedTaskDefinition.retryDelaySeconds = 0 modifiedTaskDefinition.timeoutPolicy = TaskDef.TimeoutPolicy.RETRY metadataService.updateTaskDef(modifiedTaskDefinition) diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy index 9bf8bb105..b0bc1af36 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy @@ -80,15 +80,15 @@ class WorkflowTestUtil { (0..20).collect { "integration_task_$it" } .findAll { !getPersistedTaskDefinition(it).isPresent() } - .collect { new TaskDef(it, it, DEFAULT_EMAIL_ADDRESS, 1, 120, 120) } + .collect { new TaskDef(it, it, DEFAULT_EMAIL_ADDRESS, 1, 120, 120, 500) } .forEach { metadataService.registerTaskDef([it]) } (0..4).collect { "integration_task_0_RT_$it" } .findAll { !getPersistedTaskDefinition(it).isPresent() } - .collect { new TaskDef(it, it, DEFAULT_EMAIL_ADDRESS, 0, 120, 120) } + .collect { new TaskDef(it, it, DEFAULT_EMAIL_ADDRESS, 0, 120, 120, 500) } .forEach { metadataService.registerTaskDef([it]) } - metadataService.registerTaskDef([new TaskDef('short_time_out', 'short_time_out', DEFAULT_EMAIL_ADDRESS, 1, 5, 5)]) + metadataService.registerTaskDef([new TaskDef('short_time_out', 'short_time_out', DEFAULT_EMAIL_ADDRESS, 1, 5, 5, 50)]) //This taskWithResponseTimeOut is required by the integration test which exercises the response time out scenarios TaskDef taskWithResponseTimeOut = new TaskDef() @@ -97,6 +97,7 @@ class WorkflowTestUtil { taskWithResponseTimeOut.retryCount = RETRY_COUNT taskWithResponseTimeOut.retryDelaySeconds = 0 taskWithResponseTimeOut.responseTimeoutSeconds = 10 + taskWithResponseTimeOut.totalTimeoutSeconds = 500 taskWithResponseTimeOut.ownerEmail = DEFAULT_EMAIL_ADDRESS TaskDef optionalTask = new TaskDef() @@ -163,6 +164,7 @@ class WorkflowTestUtil { eventTaskX.name = 'eventX' eventTaskX.timeoutSeconds = 10 eventTaskX.responseTimeoutSeconds = 10 + eventTaskX.totalTimeoutSeconds = 100 eventTaskX.ownerEmail = DEFAULT_EMAIL_ADDRESS metadataService.registerTaskDef(