From 1bcb09e78014c0a7b9771762e43260647d5fffbc Mon Sep 17 00:00:00 2001 From: Anatoly Myachev Date: Wed, 21 Feb 2024 18:16:27 +0100 Subject: [PATCH] TEST-#6016: make sure 'eval_general' doesn't expect exceptions by default Signed-off-by: Anatoly Myachev --- modin/pandas/test/dataframe/test_map_metadata.py | 2 -- modin/pandas/test/dataframe/test_udf.py | 6 ------ modin/pandas/test/test_groupby.py | 3 --- modin/pandas/test/test_io.py | 3 --- modin/pandas/test/utils.py | 2 +- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/modin/pandas/test/dataframe/test_map_metadata.py b/modin/pandas/test/dataframe/test_map_metadata.py index 2e49abd9dd3..1c84be9539a 100644 --- a/modin/pandas/test/dataframe/test_map_metadata.py +++ b/modin/pandas/test/dataframe/test_map_metadata.py @@ -563,8 +563,6 @@ def test_astype_int64_to_astype_category_github_issue_6259(): index=["a", "b", "c", "d", "e"], ), lambda df: df["c0"].astype("Int64").astype("category"), - # work around https://github.com/modin-project/modin/issues/6016 - raising_exceptions=(Exception,), ) diff --git a/modin/pandas/test/dataframe/test_udf.py b/modin/pandas/test/dataframe/test_udf.py index 2bd82aca804..2e549d051c1 100644 --- a/modin/pandas/test/dataframe/test_udf.py +++ b/modin/pandas/test/dataframe/test_udf.py @@ -450,8 +450,6 @@ def test_query_named_index(): eval_general( *(df.set_index("col1") for df in create_test_dfs(test_data["int_data"])), lambda df: df.query("col1 % 2 == 0 | col3 % 2 == 1"), - # work around https://github.com/modin-project/modin/issues/6016 - raising_exceptions=(Exception,), ) @@ -462,8 +460,6 @@ def test_query_named_multiindex(): for df in create_test_dfs(test_data["int_data"]) ), lambda df: df.query("col1 % 2 == 1 | col3 % 2 == 1"), - # work around https://github.com/modin-project/modin/issues/6016 - raising_exceptions=(Exception,), ) @@ -476,8 +472,6 @@ def make_df(without_index): eval_general( *(make_df(df) for df in create_test_dfs(test_data["int_data"])), lambda df: df.query("ilevel_0 % 2 == 0 | ilevel_1 % 2 == 1 | col4 % 2 == 1"), - # work around https://github.com/modin-project/modin/issues/6016 - raising_exceptions=(Exception,), ) diff --git a/modin/pandas/test/test_groupby.py b/modin/pandas/test/test_groupby.py index fe1cd865a15..d6d81f06775 100644 --- a/modin/pandas/test/test_groupby.py +++ b/modin/pandas/test/test_groupby.py @@ -2797,9 +2797,6 @@ def test_groupby_agg_with_empty_column_partition_6175(method): df, df._to_pandas(), lambda df: getattr(df.groupby(["col33", "index"]), method)(), - # work around https://github.com/modin-project/modin/issues/6016: we don't - # expect any exceptions. - raising_exceptions=(Exception,), ) diff --git a/modin/pandas/test/test_io.py b/modin/pandas/test/test_io.py index 4cde4d8a5ed..53423507b5b 100644 --- a/modin/pandas/test/test_io.py +++ b/modin/pandas/test/test_io.py @@ -3200,9 +3200,6 @@ def test_to_dict_series(kwargs): eval_general( *[df.iloc[:, 0] for df in create_test_dfs(utils_test_data["int_data"])], lambda df: df.to_dict(**kwargs), - # TODO(https://github.com/modin-project/modin/issues/6016): fix eval_general - # and remove this raising_exceptions - raising_exceptions=(Exception,), ) diff --git a/modin/pandas/test/utils.py b/modin/pandas/test/utils.py index 55420b1d46f..f0358eea816 100644 --- a/modin/pandas/test/utils.py +++ b/modin/pandas/test/utils.py @@ -870,7 +870,7 @@ def eval_general( comparator=df_equals, __inplace__=False, check_exception_type=True, - raising_exceptions=None, + raising_exceptions=(Exception,), check_kwargs_callable=True, md_extra_kwargs=None, comparator_kwargs=None,