Skip to content

Commit

Permalink
fix merge tests
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Chigarev <[email protected]>
  • Loading branch information
dchigarev committed Jan 29, 2024
1 parent 3ad237a commit b6e76f3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions modin/pandas/test/test_general.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,15 @@ 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"
)
with pytest.raises(ValueError), warns_that_defaulting_to_pandas():
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"
)
Expand All @@ -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"
)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b6e76f3

Please sign in to comment.