git commit: Merge pull request #145 from aarondav/sls-fix

[rx...@apache.org]

Updated Branches:
  refs/heads/branch-0.8 0f6278641 -> c8e0c0dc1


Merge pull request #145 from aarondav/sls-fix

Attempt to fix SparkListenerSuite breakage

Could not reproduce locally, but this test could've been flaky if the build machine was too fast, due to typo. (index 0 is intentionally slowed down to ensure total time is >= 1 ms)

This should be merged into branch-0.8 as well.

(cherry picked from commit 951024feeadcf73b50c3c80ec9e75c7e2214a7a4)
Signed-off-by: Reynold Xin <rx...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c8e0c0dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c8e0c0dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c8e0c0dc

Branch: refs/heads/branch-0.8
Commit: c8e0c0dc17ad24870f7f5a03ae1246a652a1c74e
Parents: 0f62786
Author: Reynold Xin <rx...@apache.org>
Authored: Wed Nov 6 09:36:14 2013 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Wed Nov 6 09:40:00 2013 -0800

----------------------------------------------------------------------
 .../test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c8e0c0dc/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala
index f7f5995..1fd7642 100644
--- a/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala
@@ -83,7 +83,7 @@ class SparkListenerSuite extends FunSuite with LocalSparkContext with ShouldMatc
       i
     }
 
-    val d = sc.parallelize(1 to 1e4.toInt, 64).map{i => w(i)}
+    val d = sc.parallelize(0 to 1e4.toInt, 64).map{i => w(i)}
     d.count()
     assert(sc.dagScheduler.listenerBus.waitUntilEmpty(WAIT_TIMEOUT_MILLIS))
     listener.stageInfos.size should be (1)