Skip to content

Commit 46c8697

Browse files
committed
fix test case.
1 parent 7ff4ccf commit 46c8697

File tree

3 files changed

+33
-1
lines changed

3 files changed

+33
-1
lines changed

sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,26 @@ package org.apache.spark.sql
2020
import java.io.FileNotFoundException
2121

2222
import org.apache.hadoop.fs.Path
23+
import org.scalatest.BeforeAndAfterAll
2324

2425
import org.apache.spark.SparkException
2526
import org.apache.spark.sql.internal.SQLConf
2627
import org.apache.spark.sql.test.SharedSQLContext
2728

28-
class FileBasedDataSourceSuite extends QueryTest with SharedSQLContext {
29+
30+
class FileBasedDataSourceSuite extends QueryTest with SharedSQLContext with BeforeAndAfterAll {
2931
import testImplicits._
3032

33+
override def beforeAll(): Unit = {
34+
super.beforeAll()
35+
spark.sessionState.conf.setConf(SQLConf.ORC_IMPLEMENTATION, "native")
36+
}
37+
38+
override def afterAll(): Unit = {
39+
spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
40+
super.afterAll()
41+
}
42+
3143
private val allFileBasedDataSources = Seq("orc", "parquet", "csv", "json", "text")
3244
private val nameWithSpecialChars = "sp&cial%c hars"
3345

sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSinkSuite.scala

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ import org.apache.spark.util.Utils
3333
class FileStreamSinkSuite extends StreamTest {
3434
import testImplicits._
3535

36+
override def beforeAll(): Unit = {
37+
super.beforeAll()
38+
spark.sessionState.conf.setConf(SQLConf.ORC_IMPLEMENTATION, "native")
39+
}
40+
41+
override def afterAll(): Unit = {
42+
spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
43+
super.afterAll()
44+
}
45+
3646
test("unpartitioned writing and batch reading") {
3747
val inputData = MemoryStream[Int]
3848
val df = inputData.toDF()

sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,16 @@ class FileStreamSourceSuite extends FileStreamSourceTest {
207207
.collect { case s @ StreamingRelation(dataSource, _, _) => s.schema }.head
208208
}
209209

210+
override def beforeAll(): Unit = {
211+
super.beforeAll()
212+
spark.sessionState.conf.setConf(SQLConf.ORC_IMPLEMENTATION, "native")
213+
}
214+
215+
override def afterAll(): Unit = {
216+
spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
217+
super.afterAll()
218+
}
219+
210220
// ============= Basic parameter exists tests ================
211221

212222
test("FileStreamSource schema: no path") {

0 commit comments

Comments
 (0)