Skip to content

Commit

Permalink
Use xfail consistently for known failing tests (#867)
Browse files Browse the repository at this point in the history
* Uncomment tests in test_compatibility.py

* Uncomments tests in test_explain.py

* xfail instead of skipping for failing independent cluster tests

* Switch skips to xfails in test_groupby.py

* Uncomments tests in test_over.py

* Switch skips to xfails in test_postgres.py

* Uncomments tests in test_rex.py

* Switch skips to xfails in test_schema.py

* Switch skips to xfails in test_jdbc.py

* Switch skips to xfails in test_sample.py

* Switch skips to xfails in test_server.py

* Uncomments tests in test_context.py

* Un-xfail passing tests

* Add xfails to some broken tests

* xfail alter table/schema tests

* Un-xfail test_regr_aggregation on GPU

* Fix external scheduler xfail

* Replace skip_if_external_scheduler in ML wrapper tests

* unxfail test_date_functions

* Set max constraint for fastapi

* Skip test_iterative_and_prediction on cluster

* Fix style errors

* Remove uses of skip_if_external_scheduler

* Resolve remaining cluster tests

* un-xfail fugue tests

Co-authored-by: Ayush Dattagupta <ayushdg95@gmail.com>
  • Loading branch information
charlesbluca and ayushdg committed Jan 10, 2023
1 parent fa36ac0 commit 07db18f
Show file tree
Hide file tree
Showing 25 changed files with 352 additions and 260 deletions.
3 changes: 2 additions & 1 deletion continuous_integration/environment-3.10-dev.yaml
Expand Up @@ -4,7 +4,8 @@ channels:
- nodefaults
dependencies:
- dask>=2022.3.0
- fastapi>=0.69.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
- fugue>=0.7.3
- intake>=0.6.0
- jsonschema
Expand Down
3 changes: 2 additions & 1 deletion continuous_integration/environment-3.9-dev.yaml
Expand Up @@ -4,7 +4,8 @@ channels:
- nodefaults
dependencies:
- dask>=2022.3.0
- fastapi>=0.69.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
- fugue>=0.7.3
- intake>=0.6.0
- jsonschema
Expand Down
3 changes: 2 additions & 1 deletion continuous_integration/gpuci/environment.yaml
Expand Up @@ -7,7 +7,8 @@ channels:
- nodefaults
dependencies:
- dask>=2022.3.0
- fastapi>=0.69.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
- fugue>=0.7.3
- intake>=0.6.0
- jsonschema
Expand Down
3 changes: 2 additions & 1 deletion continuous_integration/recipe/meta.yaml
Expand Up @@ -32,7 +32,8 @@ requirements:
- python
- dask >=2022.3.0
- pandas >=1.4.0
- fastapi >=0.69.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi >=0.69.0,<0.87.0
- uvicorn >=0.13.4
- tzlocal >=2.1
- prompt-toolkit >=3.0.8
Expand Down
3 changes: 2 additions & 1 deletion docker/conda.txt
Expand Up @@ -10,7 +10,8 @@ pytest-xdist
mock>=4.0.3
sphinx>=3.2.1
tzlocal>=2.1
fastapi>=0.69.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
fastapi>=0.69.0,<0.87.0
nest-asyncio>=1.4.3
uvicorn>=0.13.4
pyarrow>=6.0.1
Expand Down
3 changes: 2 additions & 1 deletion docker/main.dockerfile
Expand Up @@ -18,7 +18,8 @@ RUN mamba install -y \
# core dependencies
"dask>=2022.3.0" \
"pandas>=1.4.0" \
"fastapi>=0.69.0" \
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
"fastapi>=0.69.0,<0.87.0" \
"uvicorn>=0.13.4" \
"tzlocal>=2.1" \
"prompt_toolkit>=3.0.8" \
Expand Down
3 changes: 2 additions & 1 deletion docs/environment.yml
Expand Up @@ -11,7 +11,8 @@ dependencies:
- pandas>=1.4.0
- fugue>=0.7.3
- jpype1>=1.0.2
- fastapi>=0.69.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
- uvicorn>=0.13.4
- tzlocal>=2.1
- prompt_toolkit>=3.0.8
Expand Down
3 changes: 2 additions & 1 deletion docs/requirements-docs.txt
Expand Up @@ -4,7 +4,8 @@ dask-sphinx-theme>=3.0.0
dask>=2022.3.0
pandas>=1.4.0
fugue>=0.7.3
fastapi>=0.69.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
fastapi>=0.69.0,<0.87.0
uvicorn>=0.13.4
tzlocal>=2.1
prompt_toolkit>=3.0.8
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Expand Up @@ -44,7 +44,8 @@
install_requires=[
"dask[dataframe,distributed]>=2022.3.0",
"pandas>=1.4.0",
"fastapi>=0.69.0",
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
"fastapi>=0.69.0,<0.87.0",
"uvicorn>=0.13.4",
"tzlocal>=2.1",
"prompt_toolkit>=3.0.8",
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/fixtures.py
Expand Up @@ -332,15 +332,15 @@ def gpu_client(gpu_cluster):
# client for all computations. otherwise, only connect to a client
# when specified.
@pytest.fixture(
scope="function" if SCHEDULER_ADDR is None else "session",
scope="function",
autouse=False if SCHEDULER_ADDR is None else True,
)
def client():
with Client(address=SCHEDULER_ADDR) as client:
yield client


skip_if_external_scheduler = pytest.mark.skipif(
os.getenv("DASK_SQL_TEST_SCHEDULER", None) is not None,
xfail_if_external_scheduler = pytest.mark.xfail(
condition=os.getenv("DASK_SQL_TEST_SCHEDULER", None) is not None,
reason="Can not run with external cluster",
)

0 comments on commit 07db18f

Please sign in to comment.