Skip to content

[SQL] Duplicate test exception in SQLQueryTestSuite due to meta files(.DS_Store) on Mac #17060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dilipbiswal wants to merge 2 commits into from
Closed

[SQL] Duplicate test exception in SQLQueryTestSuite due to meta files(.DS_Store) on Mac #17060

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f2a6a8
Duplicate test exception
dilipbiswal Feb 24, 2017
4837de8
review comments
dilipbiswal Feb 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQueryTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ class SQLQueryTestSuite extends QueryTest with SharedSQLContext {

/** List of test cases to ignore, in lower cases. */
private val blackList = Set(
"blacklist.sql" // Do NOT remove this one. It is here to test the blacklist functionality.
"blacklist.sql", // Do NOT remove this one. It is here to test the blacklist functionality.
".DS_Store" // A meta-file that may be created on Mac by Finder App.
// We should ignore this file from processing.
)

// Create all the test cases.
Expand All @@ -121,7 +123,7 @@ class SQLQueryTestSuite extends QueryTest with SharedSQLContext {
}

private def createScalaTestCase(testCase: TestCase): Unit = {
if (blackList.contains(testCase.name.toLowerCase)) {
if (blackList.exists(t => testCase.name.toLowerCase.contains(t.toLowerCase))) {
// Create a test case to ignore this case.
ignore(testCase.name) { /* Do nothing */ }
} else {
Expand Down Expand Up @@ -241,7 +243,9 @@ class SQLQueryTestSuite extends QueryTest with SharedSQLContext {
private def listTestCases(): Seq[TestCase] = {
listFilesRecursively(new File(inputFilePath)).map { file =>
val resultFile = file.getAbsolutePath.replace(inputFilePath, goldenFilePath) + ".out"
TestCase(file.getName, file.getAbsolutePath, resultFile)
val absPath = file.getAbsolutePath
val testCaseName = absPath.stripPrefix(inputFilePath).stripPrefix(File.separator)
TestCase(testCaseName, absPath, resultFile)
}
}

Expand Down