diff options
| author | Brett Randall <javabrett@gmail.com> | 2016-06-05 15:31:56 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2016-06-05 15:31:56 +0100 |
| commit | 4e767d0f9042bfea6074c2637438859699ec4dc3 (patch) | |
| tree | 49873b726944dad361a23ee83cc471b58607bc4a /core/src | |
| parent | 0f307db5e17e1e8a655cfa751218ac4ed88717a7 (diff) | |
| download | spark-4e767d0f9042bfea6074c2637438859699ec4dc3.tar.gz spark-4e767d0f9042bfea6074c2637438859699ec4dc3.tar.bz2 spark-4e767d0f9042bfea6074c2637438859699ec4dc3.zip | |
[SPARK-15723] Fixed local-timezone-brittle test where short-timezone form "EST" is …
## What changes were proposed in this pull request?
Stop using the abbreviated and ambiguous timezone "EST" in a test, since it is machine-local default timezone dependent, and fails in different timezones. Fixed [SPARK-15723](https://issues.apache.org/jira/browse/SPARK-15723).
## How was this patch tested?
Note that to reproduce this problem in any locale/timezone, you can modify the scalatest-maven-plugin argLine to add a timezone:
<argLine>-ea -Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=${CodeCacheSize} -Duser.timezone="Australia/Sydney"</argLine>
and run
$ mvn test -DwildcardSuites=org.apache.spark.status.api.v1.SimpleDateParamSuite -Dtest=none. Equally this will fix it in an effected timezone:
<argLine>-ea -Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=${CodeCacheSize} -Duser.timezone="America/New_York"</argLine>
To test the fix, apply the above change to `pom.xml` to set test TZ to `Australia/Sydney`, and confirm the test now passes.
Author: Brett Randall <javabrett@gmail.com>
Closes #13462 from javabrett/SPARK-15723-SimpleDateParamSuite.
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala | 3 |
1 files changed, 2 insertions, 1 deletions
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 63b0e77629..18baeb1cb9 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.190EST").timestamp should be (1424470877190L) + // 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") |