[SPARK-12552][FOLLOWUP] Fix flaky test for "o.a.s.deploy.master.MasterSuite.master correctly recover the application"

jerryshao · cloud-fan · commit 2837b14cdc42 · 2017-06-16T14:24:15.000+08:00
## What changes were proposed in this pull request? Due to the RPC asynchronous event processing, The test "correctly recover the application" could potentially be failed. The issue could be found in here: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/78126/testReport/org.apache.spark.deploy.master/MasterSuite/master_correctly_recover_the_application/. So here fixing this flaky test. ## How was this patch tested? Existing UT. CC cloud-fan jiangxb1987 , please help to review, thanks! Author: jerryshao <sshao@hortonworks.com> Closes apache#18321 from jerryshao/SPARK-12552-followup.
diff --git a/core/src/test/scala/org/apache/spark/deploy/master/MasterSuite.scala b/core/src/test/scala/org/apache/spark/deploy/master/MasterSuite.scala
@@ -214,7 +214,7 @@ class MasterSuite extends SparkFunSuite
       master.rpcEnv.setupEndpoint(Master.ENDPOINT_NAME, master)
       // Wait until Master recover from checkpoint data.
       eventually(timeout(5 seconds), interval(100 milliseconds)) {
-        master.idToApp.size should be(1)
+        master.workers.size should be(1)
       }
 
       master.idToApp.keySet should be(Set(fakeAppInfo.id))

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ class MasterSuite extends SparkFunSuite`
`214`	`214`	`master.rpcEnv.setupEndpoint(Master.ENDPOINT_NAME, master)`
`215`	`215`	`// Wait until Master recover from checkpoint data.`
`216`	`216`	`eventually(timeout(5 seconds), interval(100 milliseconds)) {`
`217`		`- master.idToApp.size should be(1)`
	`217`	`+ master.workers.size should be(1)`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`master.idToApp.keySet should be(Set(fakeAppInfo.id))`