Repository: maven-surefire Updated Branches: refs/heads/master d8cc6f551 -> 78a885f8b
[SUREFIRE-580] build fix Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/78a885f8 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/78a885f8 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/78a885f8 Branch: refs/heads/master Commit: 78a885f8b8975a8f35ed153f51b9c13d2873a5c4 Parents: d8cc6f5 Author: Tibor17 <tibo...@lycos.com> Authored: Mon Sep 7 21:50:30 2015 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Mon Sep 7 21:50:30 2015 +0200 ---------------------------------------------------------------------- .../test/resources/fail-fast-junit/src/test/java/pkg/BTest.java | 3 ++- .../test/resources/fail-fast-junit/src/test/java/pkg/CTest.java | 3 ++- .../test/resources/fail-fast-junit/src/test/java/pkg/DTest.java | 3 ++- .../test/resources/fail-fast-testng/src/test/java/pkg/BTest.java | 3 ++- .../test/resources/fail-fast-testng/src/test/java/pkg/CTest.java | 3 ++- .../test/resources/fail-fast-testng/src/test/java/pkg/DTest.java | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/78a885f8/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 f72a068..a968b42 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 @@ -10,7 +10,8 @@ public class BTest public void test() throws InterruptedException { - TimeUnit.SECONDS.sleep( 1 ); + // checking processros # due to very slow Windows Jenkins machines + TimeUnit.SECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3 : 1 ); throw new RuntimeException(); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/78a885f8/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 2cad77c..6c609d7 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 @@ -10,7 +10,8 @@ public class CTest public void test() throws InterruptedException { - TimeUnit.MILLISECONDS.sleep(500); + // checking processros # due to very slow Windows Jenkins machines + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1500 : 500 ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/78a885f8/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 6fff98d..dfd5a0e 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 @@ -10,7 +10,8 @@ public class DTest public void test() throws InterruptedException { - TimeUnit.MILLISECONDS.sleep(500); + // checking processros # due to very slow Windows Jenkins machines + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1500 : 500 ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/78a885f8/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 6e3fd1f..c5c5f3b 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 @@ -10,7 +10,8 @@ public class BTest public void test() throws InterruptedException { - TimeUnit.SECONDS.sleep( 1 ); + // checking processros # due to very slow Windows Jenkins machines + TimeUnit.SECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3 : 1 ); throw new RuntimeException(); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/78a885f8/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 41e1629..6978391 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 @@ -10,7 +10,8 @@ public class CTest public void test() throws InterruptedException { - TimeUnit.MILLISECONDS.sleep(500); + // checking processros # due to very slow Windows Jenkins machines + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1500 : 500 ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/78a885f8/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 ca5292b..5ad8bd3 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 @@ -10,7 +10,8 @@ public class DTest public void test() throws InterruptedException { - TimeUnit.MILLISECONDS.sleep(500); + // checking processros # due to very slow Windows Jenkins machines + TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 1500 : 500 ); } }
