File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed
core/src/test/scala/org/apache/spark/deploy Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -74,20 +74,26 @@ trait TestPrematureExit {
7474 @ volatile var exitedCleanly = false
7575 mainObject.exitFn = (_) => exitedCleanly = true
7676
77+ var message : String = null
7778 val thread = new Thread {
7879 override def run () = try {
7980 mainObject.main(input)
8081 } catch {
8182 // If exceptions occur after the "exit" has happened, fine to ignore them.
8283 // These represent code paths not reachable during normal execution.
83- case e : Exception => if (! exitedCleanly) throw e
84+ case e : Exception =>
85+ message = e.getMessage
86+ if (! (exitedCleanly || message.contains(searchString))) {
87+ throw e
88+ }
8489 }
8590 }
8691 thread.start()
8792 thread.join()
8893 val joined = printStream.lineBuffer.mkString(" \n " )
89- if (! joined.contains(searchString)) {
90- fail(s " Search string ' $searchString' not found in $joined" )
94+ if (! (joined.contains(searchString) ||
95+ (message != null && message.contains(searchString)))) {
96+ fail(s " Search string ' $searchString' not found in $joined or in $message" )
9197 }
9298 }
9399}
You can’t perform that action at this time.
0 commit comments