You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2015/10/04 23:06:43 UTC
maven-surefire git commit: [SUREFIRE] fixed build (exec time of tests
== timeout => cannot guarantee timeout to fail)
Repository: maven-surefire
Updated Branches:
refs/heads/master 9b5752f99 -> dbc4f5b2d
[SUREFIRE] fixed build (exec time of tests == timeout => cannot guarantee timeout to fail)
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/dbc4f5b2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/dbc4f5b2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/dbc4f5b2
Branch: refs/heads/master
Commit: dbc4f5b2da646f710853cb666675aae5b7fd4be6
Parents: 9b5752f
Author: Tibor17 <ti...@lycos.com>
Authored: Sun Oct 4 23:05:22 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Sun Oct 4 23:05:22 2015 +0200
----------------------------------------------------------------------
.../surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java | 3 ++-
.../src/test/resources/fork-timeout/pom.xml | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dbc4f5b2/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
index f10c3b7..e1a258a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
@@ -34,6 +34,7 @@ public class Surefire705ParallelForkTimeoutIT
public void testTimeoutForked()
{
unpack( "/fork-timeout" ).setJUnitVersion( "4.8.1" ).addGoal( "-Djunit.version=4.8.1" ).addGoal(
- "-Djunit.parallel=classes" ).addGoal( "-DtimeOut=1" ).maven().withFailure().executeTest();
+ "-Djunit.parallel=classes" ).addGoal( "-DtimeOut=1" ).maven().withFailure().executeTest()
+ .verifyTextInLog( "There was a timeout or other error in the fork" );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dbc4f5b2/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml b/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
index d951bb9..55889c6 100644
--- a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
@@ -34,7 +34,8 @@
<configuration>
<forkMode>${forkMode}</forkMode>
<parallel>${junit.parallel}</parallel>
- <threadCount>5</threadCount>
+ <threadCount>3</threadCount>
+ <perCoreThreadCount>false</perCoreThreadCount>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<forkedProcessTimeoutInSeconds>${timeOut}</forkedProcessTimeoutInSeconds>
<reportFormat>plain</reportFormat>