From 7dfc17b0b91c177dfa30a692925e644443726c90 Mon Sep 17 00:00:00 2001 From: Brett Randall Date: Thu, 2 Jun 2016 13:44:19 +1000 Subject: [PATCH 1/2] Fixed local-timezone-brittle test where short-timezone form "EST" is ambiguous. Use -0500 instead. Fixed SPARK-15723. --- .../org/apache/spark/status/api/v1/SimpleDateParamSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala b/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala index 63b0e77629dd..9e1a426dd23c 100644 --- a/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala +++ b/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala @@ -26,7 +26,7 @@ class SimpleDateParamSuite extends SparkFunSuite with Matchers { test("date parsing") { new SimpleDateParam("2015-02-20T23:21:17.190GMT").timestamp should be (1424474477190L) - new SimpleDateParam("2015-02-20T17:21:17.190EST").timestamp should be (1424470877190L) + new SimpleDateParam("2015-02-20T17:21:17.190-0500").timestamp should be (1424470877190L) // don't use EST, it is ambiguous, see SPARK-15723 new SimpleDateParam("2015-02-20").timestamp should be (1424390400000L) // GMT intercept[WebApplicationException] { new SimpleDateParam("invalid date") From 49e4f1f499635c9473e4d102b537235c17229f9a Mon Sep 17 00:00:00 2001 From: Brett Randall Date: Fri, 3 Jun 2016 12:04:01 +1000 Subject: [PATCH 2/2] Fixed comment, long-line breaking scala style check. --- .../org/apache/spark/status/api/v1/SimpleDateParamSuite.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala b/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala index 9e1a426dd23c..18baeb1cb9c7 100644 --- a/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala +++ b/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala @@ -26,7 +26,8 @@ class SimpleDateParamSuite extends SparkFunSuite with Matchers { test("date parsing") { new SimpleDateParam("2015-02-20T23:21:17.190GMT").timestamp should be (1424474477190L) - new SimpleDateParam("2015-02-20T17:21:17.190-0500").timestamp should be (1424470877190L) // don't use EST, it is ambiguous, see SPARK-15723 + // don't use EST, it is ambiguous, use -0500 instead, see SPARK-15723 + new SimpleDateParam("2015-02-20T17:21:17.190-0500").timestamp should be (1424470877190L) new SimpleDateParam("2015-02-20").timestamp should be (1424390400000L) // GMT intercept[WebApplicationException] { new SimpleDateParam("invalid date")