diff options
| author | Tim Ellison <tellison@users.noreply.github.com> | 2015-05-13 21:16:32 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-05-13 21:16:32 +0100 |
| commit | 51030b8a9d4f3feb7a5d2249cc867fd6a06f0336 (patch) | |
| tree | 7b423fed07f7e0395ca4fbc41836ade39ef1a8dd /core | |
| parent | 3cd9ad2406c59cd0ede6c9c8428a4ce4b805f8fa (diff) | |
| download | spark-51030b8a9d4f3feb7a5d2249cc867fd6a06f0336.tar.gz spark-51030b8a9d4f3feb7a5d2249cc867fd6a06f0336.tar.bz2 spark-51030b8a9d4f3feb7a5d2249cc867fd6a06f0336.zip | |
[MINOR] [CORE] Accept alternative mesos unsatisfied link error in test.
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 <tellison@users.noreply.github.com>
Author: Tim Ellison <t.p.ellison@gmail.com>
Closes #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.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala index bbed8ddc6b..9343f4fff8 100644 --- a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala +++ b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala @@ -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) } |