From b1079d74f9cdc3d70e136a398bfefc00864f4c16 Mon Sep 17 00:00:00 2001 From: Tim Ellison Date: Wed, 13 May 2015 13:12:29 +0100 Subject: [PATCH 1/3] [MINOR] [CORE] Accept alternative mesos unsatisfied link error in test. --- .../org/apache/spark/SparkContextSchedulerCreationSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala index bbed8ddc6bafc..099e6cf39685f 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("no mesos in") || e.getMessage.contains("mesos (Not found in java.library.path)")) logWarning("Mesos not available, could not test actual Mesos scheduler creation") case e: Throwable => fail(e) } From f48c1941dcfcb7e7ba35a1e552012b5830aa4539 Mon Sep 17 00:00:00 2001 From: Tim Ellison Date: Wed, 13 May 2015 14:45:24 +0100 Subject: [PATCH 2/3] Split long line --- .../org/apache/spark/SparkContextSchedulerCreationSuite.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala index 099e6cf39685f..617683830a3c3 100644 --- a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala +++ b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala @@ -159,7 +159,8 @@ class SparkContextSchedulerCreationSuite assert(sched.backend.getClass === expectedClass) } catch { case e: UnsatisfiedLinkError => - assert(e.getMessage.contains("no mesos in") || e.getMessage.contains("mesos (Not found in java.library.path)")) + assert(e.getMessage.contains("no mesos in") || + e.getMessage.contains("mesos (Not found in java.library.path)")) logWarning("Mesos not available, could not test actual Mesos scheduler creation") case e: Throwable => fail(e) } From 2c5cd4e0a5bd1f279b281f6533779135834b1071 Mon Sep 17 00:00:00 2001 From: Tim Ellison Date: Wed, 13 May 2015 15:13:43 +0100 Subject: [PATCH 3/3] Reduce assertion to check for the mesos library name --- .../org/apache/spark/SparkContextSchedulerCreationSuite.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala index 617683830a3c3..9343f4fff89da 100644 --- a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala +++ b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala @@ -159,8 +159,7 @@ class SparkContextSchedulerCreationSuite assert(sched.backend.getClass === expectedClass) } catch { case e: UnsatisfiedLinkError => - assert(e.getMessage.contains("no mesos in") || - e.getMessage.contains("mesos (Not found in java.library.path)")) + assert(e.getMessage.contains("mesos")) logWarning("Mesos not available, could not test actual Mesos scheduler creation") case e: Throwable => fail(e) }