aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark
diff options
context:
space:
mode:
authorDavies Liu <davies@databricks.com>2015-07-10 13:05:23 -0700
committerDavies Liu <davies.liu@gmail.com>2015-07-10 13:05:23 -0700
commit05ac023dc8d9004a27c2f06ee875b0ff3743ccdd (patch)
tree639899d2e52c65fc479e365154bdd8a90435985a /python/pyspark
parentc185f3a45ddbc073192f7da41303941ee4cebd4f (diff)
downloadspark-05ac023dc8d9004a27c2f06ee875b0ff3743ccdd.tar.gz
spark-05ac023dc8d9004a27c2f06ee875b0ff3743ccdd.tar.bz2
spark-05ac023dc8d9004a27c2f06ee875b0ff3743ccdd.zip
[HOTFIX] fix flaky test in PySpark SQL
It may loss precision in microseconds when using float for it. Author: Davies Liu <davies@databricks.com> Closes #7344 from davies/fix_date_test and squashes the following commits: 249ec61 [Davies Liu] fix flaky test
Diffstat (limited to 'python/pyspark')
-rw-r--r--python/pyspark/sql/tests.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/python/pyspark/sql/tests.py b/python/pyspark/sql/tests.py
index 4d7cad5a1a..ed903334be 100644
--- a/python/pyspark/sql/tests.py
+++ b/python/pyspark/sql/tests.py
@@ -705,11 +705,12 @@ class SQLTests(ReusedPySparkTestCase):
def test_time_with_timezone(self):
day = datetime.date.today()
now = datetime.datetime.now()
- ts = time.mktime(now.timetuple()) + now.microsecond / 1e6
+ ts = time.mktime(now.timetuple())
# class in __main__ is not serializable
from pyspark.sql.tests import UTC
utc = UTC()
- utcnow = datetime.datetime.fromtimestamp(ts, utc)
+ utcnow = datetime.datetime.utcfromtimestamp(ts) # without microseconds
+ utcnow = datetime.datetime(*(utcnow.timetuple()[:6] + (now.microsecond, utc)))
df = self.sqlCtx.createDataFrame([(day, now, utcnow)])
day1, now1, utcnow1 = df.first()
self.assertEqual(day1, day)