Skip to content

[SPARK-44290][CONNECT][FOLLOW-UP] Skip flaky tests, and fix a typo in session UUID together #41913

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
HyukjinKwon wants to merge 5 commits into from
Closed

[SPARK-44290][CONNECT][FOLLOW-UP] Skip flaky tests, and fix a typo in session UUID together #41913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3dcb668
followup
HyukjinKwon Jul 10, 2023
361f614
Update python/pyspark/sql/tests/connect/client/test_artifact.py
yaooqinn Jul 10, 2023
42a19ea
Update python/pyspark/sql/tests/connect/client/test_artifact.py
yaooqinn Jul 10, 2023
0bd40d4
Update python/pyspark/sql/tests/connect/client/test_artifact.py
yaooqinn Jul 10, 2023
2ed8ea9
Update python/pyspark/sql/tests/connect/client/test_artifact.py
yaooqinn Jul 10, 2023
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
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/api/python/PythonWorkerFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ private[spark] class PythonWorkerFactory(pythonExec: String, envVars: Map[String

// Create and start the worker
val pb = new ProcessBuilder(Arrays.asList(pythonExec, "-m", workerModule))
val sessionId = envVars.getOrElse("SPARK_CONNECT_SESSION_UUID", "deafult")
val sessionId = envVars.getOrElse("SPARK_CONNECT_SESSION_UUID", "default")
if (sessionId != "default") {
pb.directory(new File(SparkFiles.getRootDirectory(), sessionId))
}
Expand Down Expand Up @@ -214,7 +214,7 @@ private[spark] class PythonWorkerFactory(pythonExec: String, envVars: Map[String
// Create and start the daemon
val command = Arrays.asList(pythonExec, "-m", daemonModule)
val pb = new ProcessBuilder(command)
val sessionId = envVars.getOrElse("SPARK_CONNECT_SESSION_UUID", "deafult")
val sessionId = envVars.getOrElse("SPARK_CONNECT_SESSION_UUID", "default")
if (sessionId != "default") {
pb.directory(new File(SparkFiles.getRootDirectory(), sessionId))
}
Expand Down
4 changes: 4 additions & 0 deletions python/pyspark/sql/tests/connect/client/test_artifact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ def func(x):
spark_session.addArtifacts(pyfile_path, pyfile=True)
self.assertEqual(spark_session.range(1).select(func("id")).first()[0], 10)

@unittest.skip("SPARK-44348: Reenable Session-based artifact test cases")
def test_add_pyfile(self):
self.check_add_pyfile(self.spark)

Expand Down Expand Up @@ -272,6 +273,7 @@ def func(x):
spark_session.addArtifacts(f"{package_path}.zip", pyfile=True)
self.assertEqual(spark_session.range(1).select(func("id")).first()[0], 5)

@unittest.skip("SPARK-44348: Reenable Session-based artifact test cases")
def test_add_zipped_package(self):
self.check_add_zipped_package(self.spark)

Expand Down Expand Up @@ -303,6 +305,7 @@ def func(x):
spark_session.addArtifacts(f"{archive_path}.zip#my_files", archive=True)
self.assertEqual(spark_session.range(1).select(func("id")).first()[0], "hello world!")

@unittest.skip("SPARK-44348: Reenable Session-based artifact test cases")
def test_add_archive(self):
self.check_add_archive(self.spark)

Expand All @@ -328,6 +331,7 @@ def func(x):
spark_session.addArtifacts(file_path, file=True)
self.assertEqual(spark_session.range(1).select(func("id")).first()[0], "Hello world!!")

@unittest.skip("SPARK-44348: Reenable Session-based artifact test cases")
def test_add_file(self):
self.check_add_file(self.spark)

Expand Down