xfail only for 3.0.0

Signed-off-by: Raza Jafri <[email protected]>
NVIDIA · Sep 3, 2020 · 557df87 · 557df87
1 parent 3bef9fb
commit 557df87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/integration_tests/src/main/python/cache_test.py b/integration_tests/src/main/python/cache_test.py
@@ -19,6 +19,7 @@
 from datetime import date
 import pyspark.sql.functions as f
 from spark_session import with_cpu_session, with_gpu_session
+from spark_init_internal import spark_version
 from join_test import create_df
 from generate_expr_test import four_op_df
 from marks import incompat, allow_non_gpu, ignore_order
@@ -61,7 +62,7 @@ def test_passing_gpuExpr_as_Expr():
 @pytest.mark.parametrize('join_type', ['Left', 'Right', 'Inner', 'LeftSemi', 'LeftAnti'], ids=idfn)
 @ignore_order
 def test_cache_join(data_gen, join_type):
-    if data_gen.data_type == BooleanType():
+    if spark_version() == "3.0.0" and data_gen.data_type == BooleanType():
         pytest.xfail("https://github.com/NVIDIA/spark-rapids/issues/350")
 
     def do_join(spark):
@@ -81,7 +82,7 @@ def do_join(spark):
 @ignore_order
 def test_cached_join_filter(data_gen, join_type):
     data, filter = data_gen
-    if data.data_type == BooleanType():
+    if spark_version() == "3.0.0" and data.data_type == BooleanType():
         pytest.xfail("https://github.com/NVIDIA/spark-rapids/issues/350")
 
     def do_join(spark):
@@ -96,7 +97,7 @@ def do_join(spark):
 @pytest.mark.parametrize('join_type', ['Left', 'Right', 'Inner', 'LeftSemi', 'LeftAnti'], ids=idfn)
 @ignore_order
 def test_cache_broadcast_hash_join(data_gen, join_type):
-    if data_gen.data_type == BooleanType():
+    if spark_version() == "3.0.0" and data_gen.data_type == BooleanType():
         pytest.xfail("https://github.com/NVIDIA/spark-rapids/issues/350")
 
     def do_join(spark):
@@ -116,7 +117,7 @@ def do_join(spark):
 @pytest.mark.parametrize('join_type', ['Left', 'Right', 'Inner', 'LeftSemi', 'LeftAnti'], ids=idfn)
 @ignore_order
 def test_cache_shuffled_hash_join(data_gen, join_type):
-    if data_gen.data_type == BooleanType():
+    if spark_version() == "3.0.0" and data_gen.data_type == BooleanType():
         pytest.xfail("https://github.com/NVIDIA/spark-rapids/issues/350")
 
     def do_join(spark):
@@ -151,7 +152,7 @@ def do_join(spark):
 @pytest.mark.parametrize('data_gen', all_gen_restricting_dates, ids=idfn)
 @allow_non_gpu('InMemoryTableScanExec', 'DataWritingCommandExec')
 def test_cache_posexplode_makearray(spark_tmp_path, data_gen):
-    if data_gen.data_type == BooleanType():
+    if spark_version() == "3.0.0" and data_gen.data_type == BooleanType():
         pytest.xfail("https://github.com/NVIDIA/spark-rapids/issues/350")
     data_path_cpu = spark_tmp_path + '/PARQUET_DATA_CPU'
     data_path_gpu = spark_tmp_path + '/PARQUET_DATA_GPU'

diff --git a/integration_tests/src/main/python/spark_init_internal.py b/integration_tests/src/main/python/spark_init_internal.py
@@ -41,3 +41,5 @@ def get_spark_i_know_what_i_am_doing():
     """
     return _spark
 
+def spark_version():
+    return _spark.version