[MINVOKER-241] Fix invalid timeout-based ITs
authorrfscholte <rfscholte@apache.org>
Thu, 17 Jan 2019 22:47:11 +0000 (23:47 +0100)
committerrfscholte <rfscholte@apache.org>
Thu, 17 Jan 2019 22:47:11 +0000 (23:47 +0100)
pom.xml
src/it/exec-timeout-invoker-level/invoker.properties
src/it/exec-timeout-invoker-level/verify.groovy [new file with mode: 0644]
src/it/exec-timeout-mojo-level/invoker.properties
src/it/exec-timeout-mojo-level/verify.groovy [new file with mode: 0644]

diff --git a/pom.xml b/pom.xml
index 91b9956..40553c4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -315,7 +315,7 @@ under the License.
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-invoker-plugin</artifactId>
-              <version>3.0.1</version>
+              <version>3.1.0</version>
               <configuration>
                 <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
                 <preBuildHookScript>setup</preBuildHookScript>
diff --git a/src/it/exec-timeout-invoker-level/verify.groovy b/src/it/exec-timeout-invoker-level/verify.groovy
new file mode 100644 (file)
index 0000000..10a8d90
--- /dev/null
@@ -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
index 482b66f..43618d4 100644 (file)
@@ -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 (file)
index 0000000..10a8d90
--- /dev/null
@@ -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