Dont' close the watcher until the end of the test

holdenk · holdenk · commit d448a264fe3e · 2020-07-21T19:13:52.000-07:00
diff --git a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala
@@ -382,7 +382,6 @@ class KubernetesSuite extends SparkFunSuite
     Eventually.eventually(TIMEOUT, patienceInterval) {
       execPods.values.nonEmpty should be (true)
     }
-    execWatcher.close()
     execPods.values.foreach(executorPodChecker(_))
     Eventually.eventually(patienceTimeout, patienceInterval) {
       expectedLogOnCompletion.foreach { e =>
@@ -394,6 +393,7 @@ class KubernetesSuite extends SparkFunSuite
           s"The application did not complete, did not find str ${e}")
       }
     }
+    execWatcher.close()
   }
 
   protected def doBasicDriverPodCheck(driverPod: Pod): Unit = {

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,6 @@ class KubernetesSuite extends SparkFunSuite`
`382`	`382`	`Eventually.eventually(TIMEOUT, patienceInterval) {`
`383`	`383`	`execPods.values.nonEmpty should be (true)`
`384`	`384`	`}`
`385`		`- execWatcher.close()`
`386`	`385`	`execPods.values.foreach(executorPodChecker(_))`
`387`	`386`	`Eventually.eventually(patienceTimeout, patienceInterval) {`
`388`	`387`	`expectedLogOnCompletion.foreach { e =>`
`@@ -394,6 +393,7 @@ class KubernetesSuite extends SparkFunSuite`
`394`	`393`	`s"The application did not complete, did not find str ${e}")`
`395`	`394`	`}`
`396`	`395`	`}`
	`396`	`+ execWatcher.close()`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`protected def doBasicDriverPodCheck(driverPod: Pod): Unit = {`