From 77a56c667216f3ff405d5e8baadc7f305064a7f3 Mon Sep 17 00:00:00 2001 From: rfscholte Date: Thu, 17 Jan 2019 23:47:11 +0100 Subject: [PATCH] [MINVOKER-241] Fix invalid timeout-based ITs --- pom.xml | 2 +- .../invoker.properties | 1 - .../exec-timeout-invoker-level/verify.groovy | 22 +++++++++++++++++++ .../invoker.properties | 1 - src/it/exec-timeout-mojo-level/verify.groovy | 22 +++++++++++++++++++ 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 src/it/exec-timeout-invoker-level/verify.groovy create mode 100644 src/it/exec-timeout-mojo-level/verify.groovy diff --git a/pom.xml b/pom.xml index 91b9956f..40553c4e 100644 --- a/pom.xml +++ b/pom.xml @@ -315,7 +315,7 @@ under the License. org.apache.maven.plugins maven-invoker-plugin - 3.0.1 + 3.1.0 ${project.build.directory}/it setup diff --git a/src/it/exec-timeout-invoker-level/invoker.properties b/src/it/exec-timeout-invoker-level/invoker.properties index 482b66f9..43618d41 100644 --- a/src/it/exec-timeout-invoker-level/invoker.properties +++ b/src/it/exec-timeout-invoker-level/invoker.properties @@ -17,4 +17,3 @@ invoker.goals = verify invoker.buildResult = failure -invoker.timeoutInSeconds = 2 diff --git a/src/it/exec-timeout-invoker-level/verify.groovy b/src/it/exec-timeout-invoker-level/verify.groovy new file mode 100644 index 00000000..10a8d90d --- /dev/null +++ b/src/it/exec-timeout-invoker-level/verify.groovy @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +def buildLog = new File( basedir, 'target/it/basic/build.log' ) + +assert !buildLog.text.contains('Total time: ') +assert !buildLog.text.contains('Finished at: ') \ No newline at end of file diff --git a/src/it/exec-timeout-mojo-level/invoker.properties b/src/it/exec-timeout-mojo-level/invoker.properties index 482b66f9..43618d41 100644 --- a/src/it/exec-timeout-mojo-level/invoker.properties +++ b/src/it/exec-timeout-mojo-level/invoker.properties @@ -17,4 +17,3 @@ invoker.goals = verify invoker.buildResult = failure -invoker.timeoutInSeconds = 2 diff --git a/src/it/exec-timeout-mojo-level/verify.groovy b/src/it/exec-timeout-mojo-level/verify.groovy new file mode 100644 index 00000000..10a8d90d --- /dev/null +++ b/src/it/exec-timeout-mojo-level/verify.groovy @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +def buildLog = new File( basedir, 'target/it/basic/build.log' ) + +assert !buildLog.text.contains('Total time: ') +assert !buildLog.text.contains('Finished at: ') \ No newline at end of file