From b6e76f32bbcf1b4cf00a7f801f2f49a090a89360 Mon Sep 17 00:00:00 2001 From: Dmitry Chigarev Date: Mon, 29 Jan 2024 16:34:46 +0100 Subject: [PATCH] fix merge tests Signed-off-by: Dmitry Chigarev --- modin/pandas/test/test_general.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modin/pandas/test/test_general.py b/modin/pandas/test/test_general.py index 5c893512a10..7a445657d2d 100644 --- a/modin/pandas/test/test_general.py +++ b/modin/pandas/test/test_general.py @@ -295,7 +295,7 @@ def test_merge_asof_bad_arguments(): modin_left, modin_right = pd.DataFrame(left), pd.DataFrame(right) # Can't mix by with left_by/right_by - with pytest.raises(ValueError), warns_that_defaulting_to_pandas(): + with pytest.raises(ValueError): pandas.merge_asof( pandas_left, pandas_right, on="a", by="b", left_by="can't do with by" ) @@ -303,7 +303,7 @@ def test_merge_asof_bad_arguments(): pd.merge_asof( modin_left, modin_right, on="a", by="b", left_by="can't do with by" ) - with pytest.raises(ValueError), warns_that_defaulting_to_pandas(): + with pytest.raises(ValueError): pandas.merge_asof( pandas_left, pandas_right, by="b", on="a", right_by="can't do with by" ) @@ -313,11 +313,11 @@ def test_merge_asof_bad_arguments(): ) # Can't mix on with left_on/right_on - with pytest.raises(ValueError), warns_that_defaulting_to_pandas(): + with pytest.raises(ValueError): pandas.merge_asof(pandas_left, pandas_right, on="a", left_on="can't do with by") with pytest.raises(ValueError), warns_that_defaulting_to_pandas(): pd.merge_asof(modin_left, modin_right, on="a", left_on="can't do with by") - with pytest.raises(ValueError), warns_that_defaulting_to_pandas(): + with pytest.raises(ValueError): pandas.merge_asof( pandas_left, pandas_right, on="a", right_on="can't do with by" ) @@ -347,7 +347,7 @@ def test_merge_asof_bad_arguments(): pandas.merge_asof(pandas_left, pandas_right, right_on="a") with pytest.raises(ValueError), warns_that_defaulting_to_pandas(): pd.merge_asof(modin_left, modin_right, right_on="a") - with pytest.raises(ValueError), warns_that_defaulting_to_pandas(): + with pytest.raises(ValueError): pandas.merge_asof(pandas_left, pandas_right) with pytest.raises(ValueError), warns_that_defaulting_to_pandas(): pd.merge_asof(modin_left, modin_right)