Skip to content

[SPARK-52627] Improve SQLTests to handle userName #203

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
wants to merge 1 commit into from
Closed

[SPARK-52627] Improve SQLTests to handle userName #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Tests/SparkConnectTests/Resources/queries/describe_database.sql.answer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
|Namespace Name| default|
| Comment| default database|
| Location|*|
| Owner| *|
| Owner| spark|
+--------------+----------------------------------------+
10 changes: 9 additions & 1 deletion Tests/SparkConnectTests/SQLTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct SQLTests {
let regexOwner = /(runner|185)/

private func cleanUp(_ str: String) -> String {
return removeOwner(removeID(removeLocation(str)))
return removeOwner(removeID(removeLocation(replaceUserName(str))))
}

private func removeID(_ str: String) -> String {
Expand All @@ -51,6 +51,14 @@ struct SQLTests {
return str.replacing(regexOwner, with: "*")
}

private func replaceUserName(_ str: String) -> String {
#if os(macOS) || os(Linux)
return str.replacing(ProcessInfo.processInfo.userName, with: "spark")
#else
return str
#endif
}

private func normalize(_ str: String) -> String {
return str.replacing(/[-]+/, with: "-").replacing(/[ ]+/, with: " ")
}
Expand Down
Loading