Skip to content

[SPARK-46812][PYTHON][TESTS][FOLLOWUP] Check should_test_connect and pyarrow to skip tests #45880

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
dongjoon-hyun wants to merge 2 commits into from
Closed

[SPARK-46812][PYTHON][TESTS][FOLLOWUP] Check should_test_connect and pyarrow to skip tests #45880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ca0099
[SPARK-46812][PYTHON][TESTS][FOLLOWUP] Check should_test_connect and …
dongjoon-hyun Apr 4, 2024
bbca08e
reformat python
dongjoon-hyun Apr 4, 2024
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
7 changes: 5 additions & 2 deletions python/pyspark/resource/tests/test_connect_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@

from pyspark.resource import ResourceProfileBuilder, TaskResourceRequests, ExecutorResourceRequests
from pyspark.sql import SparkSession
from pyspark.testing.sqlutils import have_pandas, pandas_requirement_message
from pyspark.testing.connectutils import (
should_test_connect,
connect_requirement_message,
)


@unittest.skipIf(not have_pandas, pandas_requirement_message)
@unittest.skipIf(not should_test_connect, connect_requirement_message)

@dongjoon-hyun dongjoon-hyun Apr 4, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should_test_connect covers more edge cases than have_pandas.

class ResourceProfileTests(unittest.TestCase):
def test_profile_before_sc_for_connect(self):
rpb = ResourceProfileBuilder()
Expand Down
13 changes: 11 additions & 2 deletions python/pyspark/resource/tests/test_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,16 @@
# limitations under the License.
#
import unittest
from typing import cast

from pyspark.resource import ExecutorResourceRequests, ResourceProfileBuilder, TaskResourceRequests
from pyspark.sql import SparkSession
from pyspark.testing.sqlutils import have_pandas, pandas_requirement_message
from pyspark.testing.sqlutils import (
have_pandas,
have_pyarrow,
pandas_requirement_message,
pyarrow_requirement_message,
)


class ResourceProfileTests(unittest.TestCase):
Expand Down Expand Up @@ -72,7 +78,10 @@ def assert_request_contents(exec_reqs, task_reqs):
assert_request_contents(rp3.executorResources, rp3.taskResources)
sc.stop()

@unittest.skipIf(not have_pandas, pandas_requirement_message)
@unittest.skipIf(
not have_pandas or not have_pyarrow,

@dongjoon-hyun dongjoon-hyun Apr 4, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test has df.mapInArrow(lambda x: x, df.schema, False, rp).collect() too.

cast(str, pandas_requirement_message or pyarrow_requirement_message),
)
def test_profile_before_sc_for_sql(self):
rpb = ResourceProfileBuilder()
treqs = TaskResourceRequests().cpus(2)
Expand Down