diff --git a/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETContainerTest.groovy b/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETContainerTest.groovy index b1950afd..edff758e 100644 --- a/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETContainerTest.groovy +++ b/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETContainerTest.groovy @@ -47,7 +47,7 @@ class ETContainerTest extends ContainerTest { String script = """ node { withEnv(['ET_API_HOSTNAME=${etContainer.host}', 'ET_API_PORT=${etContainer.getMappedPort(ET_PORT)}']) { - ttCheckPackage filePath: 'test.pkg' + ttCheckPackage testCasePath: 'test.pkg' } } """.stripIndent() @@ -67,7 +67,7 @@ class ETContainerTest extends ContainerTest { String script = """ node { withEnv(['ET_API_HOSTNAME=${etContainer.host}', 'ET_API_PORT=${etContainer.getMappedPort(ET_PORT)}']) { - ttCheckPackage filePath: 'testDoesNotExist.pkg' + ttCheckPackage testCasePath: 'testDoesNotExist.pkg' } } """.stripIndent() @@ -92,7 +92,7 @@ class ETContainerTest extends ContainerTest { String script = """ node { withEnv(['ET_API_HOSTNAME=${etContainer.host}', 'ET_API_PORT=${etContainer.getMappedPort(ET_PORT)}']) { - ttCheckPackage filePath: 'invalid_package_desc.pkg' + ttCheckPackage testCasePath: 'invalid_package_desc.pkg' } } """.stripIndent() @@ -117,7 +117,7 @@ class ETContainerTest extends ContainerTest { String script = """ node { withEnv(['ET_API_HOSTNAME=${etContainer.host}', 'ET_API_PORT=${etContainer.getMappedPort(ET_PORT)}']) { - ttCheckPackage filePath: 'invalid_package_desc.prj' + ttCheckPackage testCasePath: 'invalid_package_desc.prj' } } """.stripIndent() diff --git a/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/CheckPackageStepIT.groovy b/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/CheckPackageStepIT.groovy index 64ca77e3..5c9d300a 100644 --- a/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/CheckPackageStepIT.groovy +++ b/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/CheckPackageStepIT.groovy @@ -39,7 +39,8 @@ class CheckPackageStepIT extends IntegrationTestBase { def 'Run pipeline'() { given: WorkflowJob job = jenkins.createProject(WorkflowJob.class, 'pipeline') - job.setDefinition(new CpsFlowDefinition("node { ttCheckPackage 'test.pkg' }", true)) + job.setDefinition(new CpsFlowDefinition("node { " + + "ttCheckPackage testCasePath: 'test.pkg', executionConfig: [timeout: 5]}", true)) expect: WorkflowRun run = jenkins.assertBuildStatus(Result.FAILURE, job.scheduleBuild2(0).get()) jenkins.assertLogContains("Executing Package Checks for", run) diff --git a/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunPackageStepIT.groovy b/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunPackageStepIT.groovy index 744ca02f..ab9c2867 100644 --- a/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunPackageStepIT.groovy +++ b/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunPackageStepIT.groovy @@ -154,8 +154,9 @@ class RunPackageStepIT extends IntegrationTestBase { def 'Run pipeline with package check'(){ given: WorkflowJob job = jenkins.createProject(WorkflowJob.class, 'pipeline') - job.setDefinition(new CpsFlowDefinition( - "node { ttRunPackage testCasePath:'test.pkg', executionConfig: [executePackageCheck: true]}", true) + job.setDefinition(new CpsFlowDefinition("node { " + + "ttRunPackage testCasePath:'test.pkg', executionConfig: [executePackageCheck: true, timeout: 5]}", + true) ) expect: WorkflowRun run = jenkins.assertBuildStatus(Result.FAILURE, job.scheduleBuild2(0).get()) diff --git a/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunProjectStepIT.groovy b/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunProjectStepIT.groovy index bfa83ec6..9edeca0e 100644 --- a/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunProjectStepIT.groovy +++ b/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunProjectStepIT.groovy @@ -103,8 +103,9 @@ class RunProjectStepIT extends IntegrationTestBase { def 'Run pipeline with package check'() { given: WorkflowJob job = jenkins.createProject(WorkflowJob.class, 'pipeline') - job.setDefinition(new CpsFlowDefinition( - "node { ttRunProject testCasePath: 'test.prj', executionConfig: [executePackageCheck: true]}", true) + job.setDefinition(new CpsFlowDefinition("node { " + + "ttRunProject testCasePath: 'test.prj', executionConfig: [executePackageCheck: true, timeout: 5]}", + true) ) expect: WorkflowRun run = jenkins.assertBuildStatus(Result.FAILURE, job.scheduleBuild2(0).get())