Skip to content

Commit

Permalink
Switch from skipping to xfailing some Python tests (#1002)
Browse files Browse the repository at this point in the history
* xfail some skipped tests

* xfail hive/postgres tests on windows & macos

* Un-xfail xpassing tests

---------

Co-authored-by: Ayush Dattagupta <ayushdg95@gmail.com>
  • Loading branch information
charlesbluca and ayushdg committed Feb 1, 2023
1 parent 38e4cab commit 87d4804
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
3 changes: 0 additions & 3 deletions tests/integration/test_compatibility.py
Expand Up @@ -436,9 +436,6 @@ def test_agg_sum_avg_no_group_by():
)


@pytest.mark.skip(
reason="WIP DataFusion - https://github.com/dask-contrib/dask-sql/issues/534"
)
def test_agg_sum_avg():
a = make_rand_df(
100, a=(int, 50), b=(str, 50), c=(int, 30), d=(str, 40), e=(float, 40)
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_hive.py
Expand Up @@ -9,8 +9,8 @@
from dask_sql.context import Context
from tests.utils import assert_eq

pytestmark = pytest.mark.skipif(
sys.platform in ("win32", "darwin"),
pytestmark = pytest.mark.xfail(
condition=sys.platform in ("win32", "darwin"),
reason="hive testing not supported on Windows/macOS",
)
docker = pytest.importorskip("docker")
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/test_model.py
Expand Up @@ -925,7 +925,6 @@ def test_ml_experiment(c, client):

# TODO - many ML tests fail on clusters without sklearn - can we avoid this?
@xfail_if_external_scheduler
@pytest.mark.skip(reason="Waiting on https://github.com/EpistasisLab/tpot/pull/1280")
def test_experiment_automl_classifier(c, client):
tpot = pytest.importorskip("tpot", reason="tpot not installed")

Expand Down Expand Up @@ -953,7 +952,6 @@ def test_experiment_automl_classifier(c, client):

# TODO - many ML tests fail on clusters without sklearn - can we avoid this?
@xfail_if_external_scheduler
@pytest.mark.skip(reason="Waiting on https://github.com/EpistasisLab/tpot/pull/1280")
def test_experiment_automl_regressor(c, client):
tpot = pytest.importorskip("tpot", reason="tpot not installed")

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_postgres.py
Expand Up @@ -2,8 +2,8 @@

import pytest

pytestmark = pytest.mark.skipif(
sys.platform in ("win32", "darwin"),
pytestmark = pytest.mark.xfail(
condition=sys.platform in ("win32", "darwin"),
reason="hive testing not supported on Windows/macOS",
)
docker = pytest.importorskip("docker")
Expand Down

0 comments on commit 87d4804

Please sign in to comment.