From 51c708048f812ffefe3cf99887eeac7b3fedb976 Mon Sep 17 00:00:00 2001 From: Rommel Date: Mon, 5 Apr 2021 12:24:35 -0500 Subject: [PATCH 1/3] Removing workaround since cudf issue 7572 was fixed --- tests/BlazingSQLTest/Utils/__init__.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/BlazingSQLTest/Utils/__init__.py b/tests/BlazingSQLTest/Utils/__init__.py index ea8416777..11efb3bda 100644 --- a/tests/BlazingSQLTest/Utils/__init__.py +++ b/tests/BlazingSQLTest/Utils/__init__.py @@ -30,19 +30,13 @@ def test_name(queryType, fileSchemaType): def skip_test(dask_client, nRals, fileSchemaType, queryType): testsWithNulls = Settings.data["RunSettings"]["testsWithNulls"] - if fileSchemaType == DataType.DASK_CUDF: - # Skipping combination DASK_CUDF and testsWithNulls="true" - # due to https://github.com/rapidsai/cudf/issues/7572 - if dask_client is None or testsWithNulls == "true": - return True - if fileSchemaType == DataType.CUDF: # TODO dask tests percy kharoly c.gonzales # skip gdf test when we are about to run tests # on gdf tables with nRals>1 skip = False if int(nRals) > 1: - if dask_client is None or testsWithNulls == "true": + if dask_client is None: return True return skip From db5cb8d8b5f959c211b4038136d78834c05d6de4 Mon Sep 17 00:00:00 2001 From: Rommel Date: Mon, 5 Apr 2021 12:26:23 -0500 Subject: [PATCH 2/3] Edit changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e2303124..1d99caff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - #1331 Added flag to enable null e2e testing - #1418 Adding support for docker image - #1419 Added concat cache machine timeout +- #1431 Removed dask_cudf e2e workaround since cudf issue 7572 was already fixed ## Bug Fixes - #1335 Fixing uninitialized var in orc metadata and handling the parseMetadata exceptions properly From 433385d0944d82544bd83a15dfde4b229db47c83 Mon Sep 17 00:00:00 2001 From: Rommel Date: Mon, 5 Apr 2021 14:13:35 -0500 Subject: [PATCH 3/3] Fix --- tests/BlazingSQLTest/Utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/BlazingSQLTest/Utils/__init__.py b/tests/BlazingSQLTest/Utils/__init__.py index 11efb3bda..fa66e1178 100644 --- a/tests/BlazingSQLTest/Utils/__init__.py +++ b/tests/BlazingSQLTest/Utils/__init__.py @@ -36,7 +36,7 @@ def skip_test(dask_client, nRals, fileSchemaType, queryType): # on gdf tables with nRals>1 skip = False if int(nRals) > 1: - if dask_client is None: + if dask_client is None or testsWithNulls == "true": return True return skip