From 08b9b6d3d6225984e28916766c7c7104cbf2c80b Mon Sep 17 00:00:00 2001 From: Liu Fengyun Date: Tue, 30 Mar 2021 10:04:33 +0200 Subject: [PATCH] Fix #11885: disable flaky idempotency test on Windows --- tests/idempotency/IdempotencyCheck.scala | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/idempotency/IdempotencyCheck.scala b/tests/idempotency/IdempotencyCheck.scala index 6f9a8de588de..546b13487ff6 100644 --- a/tests/idempotency/IdempotencyCheck.scala +++ b/tests/idempotency/IdempotencyCheck.scala @@ -6,13 +6,12 @@ import java.util.stream.Stream as JStream import scala.collection.JavaConverters.* object IdempotencyCheck { - val blacklisted = Set( - // No fix needed. Bridges on collections in different order. Second one in scala2 order. - s"pos{JFile.separator}Map{JFile.separator}scala{JFile.separator}collection{JFile.separator}immutable/Map", - s"pos{JFile.separator}Map{JFile.separator}scala{JFile.separator}collection{JFile.separator}immutable{JFile.separator}AbstractMap", - s"pos{JFile.separator}t1203a/NodeSeq", - s"pos{JFile.separator}i2345{JFile.separator}Whatever" - ) + val flakyTestsOnWindows = + if scala.util.Properties.isWin + then Set(s"pos${JFile.separator}i6507b") + else Set.empty + + val blacklisted = flakyTestsOnWindows def checkIdempotency(dir1: String, dir2: String): Unit = { var failed = 0