build fix for race conditions
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e87f8807 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e87f8807 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e87f8807 Branch: refs/heads/master Commit: e87f8807d2594c31b5b69317a6b815416636e6e7 Parents: d8770d6 Author: Tibor17 <tibo...@lycos.com> Authored: Tue Sep 8 04:44:47 2015 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Tue Sep 8 04:44:47 2015 +0200 ---------------------------------------------------------------------- .../test/resources/fail-fast-junit/src/test/java/pkg/ATest.java | 3 ++- .../test/resources/fail-fast-junit/src/test/java/pkg/BTest.java | 2 +- .../test/resources/fail-fast-junit/src/test/java/pkg/CTest.java | 2 +- .../test/resources/fail-fast-junit/src/test/java/pkg/DTest.java | 2 +- .../test/resources/fail-fast-testng/src/test/java/pkg/ATest.java | 3 ++- .../test/resources/fail-fast-testng/src/test/java/pkg/BTest.java | 2 +- .../test/resources/fail-fast-testng/src/test/java/pkg/CTest.java | 2 +- .../test/resources/fail-fast-testng/src/test/java/pkg/DTest.java | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e87f8807/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java index 8ac8930..5a3fb4e 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java +++ b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java @@ -11,7 +11,8 @@ public class ATest public void someMethod() throws Exception { - TimeUnit.MILLISECONDS.sleep( 500 ); + // checking processros # due to very slow Windows Jenkins machines + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1200 : 500 ); throw new RuntimeException( "assert \"foo\" == \"bar\"\n" + " |\n" + " false" ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e87f8807/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java index a968b42..3015f40 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java +++ b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java @@ -11,7 +11,7 @@ public class BTest throws InterruptedException { // checking processros # due to very slow Windows Jenkins machines - TimeUnit.SECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3 : 1 ); + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3000 : 1250 ); throw new RuntimeException(); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e87f8807/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java index 6c609d7..9865e69 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java +++ b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java @@ -11,7 +11,7 @@ public class CTest throws InterruptedException { // checking processros # due to very slow Windows Jenkins machines - TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1500 : 500 ); + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3000 : 1250 ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e87f8807/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java index dfd5a0e..4167f67 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java +++ b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java @@ -11,7 +11,7 @@ public class DTest throws InterruptedException { // checking processros # due to very slow Windows Jenkins machines - TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1500 : 500 ); + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3000 : 1250 ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e87f8807/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java index acce402..b90859b 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java +++ b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java @@ -10,7 +10,8 @@ public class ATest public void someMethod() throws InterruptedException { - TimeUnit.MILLISECONDS.sleep( 500 ); + // checking processros # due to very slow Windows Jenkins machines + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1200 : 500 ); throw new RuntimeException( "assert \"foo\" == \"bar\"\n" + " |\n" + " false" ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e87f8807/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java index c5c5f3b..8cdc13d 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java +++ b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java @@ -11,7 +11,7 @@ public class BTest throws InterruptedException { // checking processros # due to very slow Windows Jenkins machines - TimeUnit.SECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3 : 1 ); + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3000 : 1250 ); throw new RuntimeException(); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e87f8807/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java index 6978391..8fe2faf 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java +++ b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java @@ -11,7 +11,7 @@ public class CTest throws InterruptedException { // checking processros # due to very slow Windows Jenkins machines - TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1500 : 500 ); + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3000 : 1250 ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e87f8807/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java index 5ad8bd3..c4ffd68 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java +++ b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java @@ -11,7 +11,7 @@ public class DTest throws InterruptedException { // checking processros # due to very slow Windows Jenkins machines - TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1500 : 500 ); + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3000 : 1250 ); } }
