You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/05/13 22:16:36 UTC
spark git commit: [MINOR] [CORE] Accept alternative mesos unsatisfied
link error in test.
Repository: spark
Updated Branches:
refs/heads/master 3cd9ad240 -> 51030b8a9
[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 <te...@users.noreply.github.com>
Author: Tim Ellison <t....@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.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/51030b8a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/51030b8a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/51030b8a
Branch: refs/heads/master
Commit: 51030b8a9d4f3feb7a5d2249cc867fd6a06f0336
Parents: 3cd9ad2
Author: Tim Ellison <te...@users.noreply.github.com>
Authored: Wed May 13 21:16:32 2015 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Wed May 13 21:16:32 2015 +0100
----------------------------------------------------------------------
.../org/apache/spark/SparkContextSchedulerCreationSuite.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/51030b8a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala
index bbed8dd..9343f4f 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)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org