You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2015/05/31 02:01:10 UTC
spark git commit: [HOTFIX] Replace FunSuite with SparkFunSuite.
Repository: spark
Updated Branches:
refs/heads/master 1281a3518 -> 66a53a696
[HOTFIX] Replace FunSuite with SparkFunSuite.
This fixes a build break introduced by merging a6430028ecd7a6130f1eb15af9ec00e242c46725,
which fails the new style checks that ensure that we use SparkFunSuite instead
of FunSuite.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/66a53a69
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/66a53a69
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/66a53a69
Branch: refs/heads/master
Commit: 66a53a69643e0004742667e140bad2aa8dae44e4
Parents: 1281a35
Author: Josh Rosen <jo...@databricks.com>
Authored: Sat May 30 16:52:34 2015 -0700
Committer: Josh Rosen <jo...@databricks.com>
Committed: Sat May 30 17:01:01 2015 -0700
----------------------------------------------------------------------
.../spark/shuffle/sort/BypassMergeSortShuffleWriterSuite.scala | 4 ++--
.../org/apache/spark/shuffle/sort/SortShuffleWriterSuite.scala | 5 ++---
.../org/apache/spark/util/collection/ExternalSorterSuite.scala | 4 ----
3 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/66a53a69/core/src/test/scala/org/apache/spark/shuffle/sort/BypassMergeSortShuffleWriterSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/shuffle/sort/BypassMergeSortShuffleWriterSuite.scala b/core/src/test/scala/org/apache/spark/shuffle/sort/BypassMergeSortShuffleWriterSuite.scala
index c8420db..542f8f4 100644
--- a/core/src/test/scala/org/apache/spark/shuffle/sort/BypassMergeSortShuffleWriterSuite.scala
+++ b/core/src/test/scala/org/apache/spark/shuffle/sort/BypassMergeSortShuffleWriterSuite.scala
@@ -29,7 +29,7 @@ import org.mockito.Matchers._
import org.mockito.Mockito._
import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.Answer
-import org.scalatest.{BeforeAndAfterEach, FunSuite}
+import org.scalatest.BeforeAndAfterEach
import org.apache.spark._
import org.apache.spark.executor.{TaskMetrics, ShuffleWriteMetrics}
@@ -37,7 +37,7 @@ import org.apache.spark.serializer.{SerializerInstance, Serializer, JavaSerializ
import org.apache.spark.storage._
import org.apache.spark.util.Utils
-class BypassMergeSortShuffleWriterSuite extends FunSuite with BeforeAndAfterEach {
+class BypassMergeSortShuffleWriterSuite extends SparkFunSuite with BeforeAndAfterEach {
@Mock(answer = RETURNS_SMART_NULLS) private var blockManager: BlockManager = _
@Mock(answer = RETURNS_SMART_NULLS) private var diskBlockManager: DiskBlockManager = _
http://git-wip-us.apache.org/repos/asf/spark/blob/66a53a69/core/src/test/scala/org/apache/spark/shuffle/sort/SortShuffleWriterSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/shuffle/sort/SortShuffleWriterSuite.scala b/core/src/test/scala/org/apache/spark/shuffle/sort/SortShuffleWriterSuite.scala
index c6ada71..34b4984 100644
--- a/core/src/test/scala/org/apache/spark/shuffle/sort/SortShuffleWriterSuite.scala
+++ b/core/src/test/scala/org/apache/spark/shuffle/sort/SortShuffleWriterSuite.scala
@@ -18,11 +18,10 @@
package org.apache.spark.shuffle.sort
import org.mockito.Mockito._
-import org.scalatest.FunSuite
-import org.apache.spark.{Aggregator, SparkConf}
+import org.apache.spark.{Aggregator, SparkConf, SparkFunSuite}
-class SortShuffleWriterSuite extends FunSuite {
+class SortShuffleWriterSuite extends SparkFunSuite {
import SortShuffleWriter._
http://git-wip-us.apache.org/repos/asf/spark/blob/66a53a69/core/src/test/scala/org/apache/spark/util/collection/ExternalSorterSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/util/collection/ExternalSorterSuite.scala b/core/src/test/scala/org/apache/spark/util/collection/ExternalSorterSuite.scala
index 7d7b41b..9cefa61 100644
--- a/core/src/test/scala/org/apache/spark/util/collection/ExternalSorterSuite.scala
+++ b/core/src/test/scala/org/apache/spark/util/collection/ExternalSorterSuite.scala
@@ -19,12 +19,8 @@ package org.apache.spark.util.collection
import scala.collection.mutable.ArrayBuffer
-import org.scalatest.PrivateMethodTester
-
import scala.util.Random
-import org.scalatest.FunSuite
-
import org.apache.spark._
import org.apache.spark.serializer.{JavaSerializer, KryoSerializer}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org