You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/02/19 15:22:25 UTC

[1/2] camel git commit: Work around test flakiness by rerunning failing tests

Repository: camel
Updated Branches:
  refs/heads/master 3b2d9294c -> d7339b2c5


Work around test flakiness by rerunning failing tests

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0aef13c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0aef13c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0aef13c5

Branch: refs/heads/master
Commit: 0aef13c5fa1d99fc4e1df3dd3650564e349fd08e
Parents: 3b2d929
Author: Andreas Veithen <ve...@google.com>
Authored: Sun Jan 10 16:43:00 2016 +0000
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 19 15:09:37 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0aef13c5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ecf577c..3e83d3c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2991,6 +2991,10 @@
            </lifecycleMappingMetadata>
          </configuration>
         </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.19.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -3047,6 +3051,7 @@
           <useFile>true</useFile>
           <failIfNoTests>false</failIfNoTests>
           <runOrder>alphabetical</runOrder>
+          <rerunFailingTestsCount>2</rerunFailingTestsCount>
           <systemPropertyVariables>
             <javax.xml.accessExternalSchema>file,http</javax.xml.accessExternalSchema>
             <javax.xml.accessExternalDTD>file,http</javax.xml.accessExternalDTD>


[2/2] camel git commit: This closes #767

Posted by da...@apache.org.
This closes #767


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d7339b2c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d7339b2c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d7339b2c

Branch: refs/heads/master
Commit: d7339b2c50e67722298698264a14b7df505579c8
Parents: 0aef13c
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 19 15:11:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 19 15:11:06 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d7339b2c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3e83d3c..7a19987 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2992,8 +2992,9 @@
          </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.19.1</version>
+          <version>{maven-surefire-plugin-version}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -3051,6 +3052,7 @@
           <useFile>true</useFile>
           <failIfNoTests>false</failIfNoTests>
           <runOrder>alphabetical</runOrder>
+          <!-- lets re-run the failed test one more time, just to be sure -->
           <rerunFailingTestsCount>2</rerunFailingTestsCount>
           <systemPropertyVariables>
             <javax.xml.accessExternalSchema>file,http</javax.xml.accessExternalSchema>