From 17506fe166af0b9763cece961b0b067e82358671 Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Fri, 27 Jul 2018 17:18:26 -0500 Subject: [PATCH] Disable test logic that depends on certain day skipping logic in Pacific timezones, as its definition changed across JDK releases --- .../sql/catalyst/util/DateTimeUtilsSuite.scala | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala index cbf6106697f30..a4e47181e0efb 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala @@ -662,21 +662,19 @@ class DateTimeUtilsSuite extends SparkFunSuite { assert(daysToMillis(16800, TimeZoneGMT) === c.getTimeInMillis) // There are some days are skipped entirely in some timezone, skip them here. - val skipped_days = Map[String, Int]( + val skippedDays = Map( "Kwajalein" -> 8632, "Pacific/Apia" -> 15338, - "Pacific/Enderbury" -> 9131, + // "Pacific/Enderbury" -> 9131, // Removed per SPARK-24950 "Pacific/Fakaofo" -> 15338, - "Pacific/Kiritimati" -> 9131, + // "Pacific/Kiritimati" -> 9131, // Removed per SPARK-24950 "Pacific/Kwajalein" -> 8632, "MIT" -> 15338) for (tz <- DateTimeTestUtils.ALL_TIMEZONES) { - val skipped = skipped_days.getOrElse(tz.getID, Int.MinValue) - (-20000 to 20000).foreach { d => - if (d != skipped) { - assert(millisToDays(daysToMillis(d, tz), tz) === d, - s"Round trip of ${d} did not work in tz ${tz}") - } + val skipped = skippedDays.getOrElse(tz.getID, Int.MinValue) + for (d <- -20000 to 20000 if d != skipped) { + assert(millisToDays(daysToMillis(d, tz), tz) === d, + s"Round trip of $d did not work in timezone $tz") } } }