[SPARK-19050][SS][TESTS] Fix EventTimeWatermarkSuite 'delay in months and years handled correctly'

zsxwing · zsxwing · commit 2394047370d2 · 2017-01-01T13:25:44.000-08:00
## What changes were proposed in this pull request? `monthsSinceEpoch` in this test is like `math.floor(num)`, so `monthDiff` has two possible values. ## How was this patch tested? Jenkins. Author: Shixiong Zhu <shixiong@databricks.com> Closes #16449 from zsxwing/watermark-test-hotfix.
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala
@@ -190,7 +190,10 @@ class EventTimeWatermarkSuite extends StreamTest with BeforeAndAfter with Loggin
       assertEventStats { e =>
         assert(timestampFormat.parse(e.get("max")).getTime === (currentTimeMs / 1000) * 1000)
         val watermarkTime = timestampFormat.parse(e.get("watermark"))
-        assert(monthsSinceEpoch(currentTime) - monthsSinceEpoch(watermarkTime) === 29)
+        val monthDiff = monthsSinceEpoch(currentTime) - monthsSinceEpoch(watermarkTime)
+        // monthsSinceEpoch is like `math.floor(num)`, so monthDiff has two possible values.
+        assert(monthDiff === 29 || monthDiff === 30,
+          s"currentTime: $currentTime, watermarkTime: $watermarkTime")
       }
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,10 @@ class EventTimeWatermarkSuite extends StreamTest with BeforeAndAfter with Loggin`
`190`	`190`	`assertEventStats { e =>`
`191`	`191`	`assert(timestampFormat.parse(e.get("max")).getTime === (currentTimeMs / 1000) * 1000)`
`192`	`192`	`val watermarkTime = timestampFormat.parse(e.get("watermark"))`
`193`		`- assert(monthsSinceEpoch(currentTime) - monthsSinceEpoch(watermarkTime) === 29)`
	`193`	`+ val monthDiff = monthsSinceEpoch(currentTime) - monthsSinceEpoch(watermarkTime)`
	`194`	+ // monthsSinceEpoch is like `math.floor(num)`, so monthDiff has two possible values.
	`195`	`+ assert(monthDiff === 29 \|\| monthDiff === 30,`
	`196`	`+ s"currentTime: $currentTime, watermarkTime: $watermarkTime")`
`194`	`197`	`}`
`195`	`198`	`)`
`196`	`199`	`}`