Skip to content

Commit

Permalink
[MINOR] [CORE] Accept alternative mesos unsatisfied link error in test.
Browse files Browse the repository at this point in the history
The IBM JVM reports an failed library load with a slightly different error message to Oracle's JVM.  Update the test case to allow for either form.

Author: Tim Ellison <[email protected]>
Author: Tim Ellison <[email protected]>

Closes apache#6119 from tellison/LibraryLoading and squashes the following commits:

2c5cd4e [Tim Ellison] Reduce assertion to check for the mesos library name
f48c194 [Tim Ellison] Split long line
b1079d7 [Tim Ellison] [MINOR] [CORE] Accept alternative mesos unsatisfied link error in test.
  • Loading branch information
tellison authored and srowen committed May 13, 2015
1 parent 3cd9ad2 commit 51030b8
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class SparkContextSchedulerCreationSuite
assert(sched.backend.getClass === expectedClass)
} catch {
case e: UnsatisfiedLinkError =>
assert(e.getMessage.contains("no mesos in"))
assert(e.getMessage.contains("mesos"))
logWarning("Mesos not available, could not test actual Mesos scheduler creation")
case e: Throwable => fail(e)
}
Expand Down

0 comments on commit 51030b8

Please sign in to comment.