diff --git a/integration_tests/src/main/python/conftest.py b/integration_tests/src/main/python/conftest.py index 499ea0c5254..a9b2f6146ec 100644 --- a/integration_tests/src/main/python/conftest.py +++ b/integration_tests/src/main/python/conftest.py @@ -154,9 +154,14 @@ def pytest_runtest_setup(item): _inject_oom = item.get_closest_marker('inject_oom') datagen_overrides = item.get_closest_marker('datagen_overrides') if datagen_overrides: + try: + seed = datagen_overrides.kwargs["seed"] + except KeyError: + raise Exception("datagen_overrides requires an override seed value") + override_seed = datagen_overrides.kwargs.get('condition', True) if override_seed: - _test_datagen_random_seed = datagen_overrides.kwargs.get('seed', _test_datagen_random_seed) + _test_datagen_random_seed = seed order = item.get_closest_marker('ignore_order') if order: diff --git a/integration_tests/src/main/python/map_test.py b/integration_tests/src/main/python/map_test.py index b121d8802a6..550e4302210 100644 --- a/integration_tests/src/main/python/map_test.py +++ b/integration_tests/src/main/python/map_test.py @@ -192,9 +192,9 @@ def query_map_scalar(spark): @allow_non_gpu('WindowLocalExec') -@datagen_overrides(condition=is_before_spark_314() +@datagen_overrides(seed=0, condition=is_before_spark_314() or (not is_before_spark_320() and is_before_spark_323()) - or (not is_before_spark_330() and is_before_spark_331()), seed=0, reason="https://issues.apache.org/jira/browse/SPARK-40089") + or (not is_before_spark_330() and is_before_spark_331()), reason="https://issues.apache.org/jira/browse/SPARK-40089") @pytest.mark.parametrize('data_gen', supported_key_map_gens, ids=idfn) @pytest.mark.xfail(condition = is_not_utc(), reason = 'xfail non-UTC time zone tests because of https://github.com/NVIDIA/spark-rapids/issues/9653') def test_map_scalars_supported_key_types(data_gen):