You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/01/17 22:47:20 UTC
[maven-invoker-plugin] 01/01: [MINVOKER-241] Fix invalid
timeout-based ITs
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MINVOKER-241
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
commit 77a56c667216f3ff405d5e8baadc7f305064a7f3
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu Jan 17 23:47:11 2019 +0100
[MINVOKER-241] Fix invalid timeout-based ITs
---
pom.xml | 2 +-
.../exec-timeout-invoker-level/invoker.properties | 1 -
src/it/exec-timeout-invoker-level/verify.groovy | 22 ++++++++++++++++++++++
src/it/exec-timeout-mojo-level/invoker.properties | 1 -
src/it/exec-timeout-mojo-level/verify.groovy | 22 ++++++++++++++++++++++
5 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 91b9956..40553c4 100644
--- 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/invoker.properties b/src/it/exec-timeout-invoker-level/invoker.properties
index 482b66f..43618d4 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 0000000..10a8d90
--- /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 482b66f..43618d4 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 0000000..10a8d90
--- /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