Repository: zest-java Updated Branches: refs/heads/develop d7e6eb830 -> 0984d0ba9
testsupport: refine FreePortFinder again ci flakiness is hard Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/d7672645 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/d7672645 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/d7672645 Branch: refs/heads/develop Commit: d76726450a2434fe8e2859521ab70201c2084421 Parents: d7e6eb8 Author: Paul Merlin <[email protected]> Authored: Sat Dec 17 20:53:00 2016 +0100 Committer: Paul Merlin <[email protected]> Committed: Sat Dec 17 20:53:00 2016 +0100 ---------------------------------------------------------------------- .../org/apache/polygene/test/util/FreePortFinder.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/d7672645/core/testsupport/src/main/java/org/apache/polygene/test/util/FreePortFinder.java ---------------------------------------------------------------------- diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/util/FreePortFinder.java b/core/testsupport/src/main/java/org/apache/polygene/test/util/FreePortFinder.java index 7bb8fad..9a43deb 100644 --- a/core/testsupport/src/main/java/org/apache/polygene/test/util/FreePortFinder.java +++ b/core/testsupport/src/main/java/org/apache/polygene/test/util/FreePortFinder.java @@ -55,21 +55,26 @@ public class FreePortFinder private static final List<Range> LEAST_USED_RANGES = Arrays.asList( new Range( 29170, 29998 ), new Range( 38866, 39680 ), - // new Range( 41798, 42507 ), // 42187 seen busy + new Range( 41798, 42507 ), new Range( 43442, 44122 ), new Range( 46337, 46997 ), new Range( 35358, 36000 ), - // new Range( 36866, 37474 ), // 37334 seen busy + new Range( 36866, 37474 ), new Range( 38204, 38799 ), - // new Range( 33657, 34248 ), // 33951 seen busy + new Range( 33657, 34248 ), new Range( 30261, 30831 ), - // new Range( 41231, 41793 ), // 41652 seen busy + new Range( 41231, 41793 ), new Range( 21011, 21552 ), new Range( 28590, 29117 ), new Range( 14415, 14935 ), new Range( 26490, 26999 ) ); + // Seen busy on builds.apache.org + private static final List<Integer> BLACKLIST = Arrays.asList( + 42187, 37334, 38615, 33951, 41652 + ); + private static final int MAX_PORT_CHECKS = 20; public static boolean isFreePortOnLocalHost( int port ) @@ -142,6 +147,7 @@ public class FreePortFinder .boxed() .collect( collectingAndThen( toList(), collected -> { + collected.removeAll( BLACKLIST ); shuffle( collected ); return collected.stream(); } ) )
