Skip to content

Commit

Permalink
rebase with master
Browse files Browse the repository at this point in the history
  • Loading branch information
SaladRaider committed May 1, 2018
1 parent ada9bf4 commit 87ad3a6
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions python/ray/dataframe/test/test_dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -812,21 +812,21 @@ def test_is_empty(df):
def test_add():
ray_df = create_test_dataframe()

func = ['sum', lambda df: df.sum()]
with pytest.raises(NotImplementedError):
test_apply(ray_df, pandas_df, func, 0)
with pytest.raises(NotImplementedError):
test_aggregate(ray_df, pandas_df, func, 0)
with pytest.raises(NotImplementedError):
test_agg(ray_df, pandas_df, func, 0)
with pytest.raises(NotImplementedError):
test_apply(ray_df, pandas_df, func, 1)
with pytest.raises(NotImplementedError):
test_aggregate(ray_df, pandas_df, func, 1)
with pytest.raises(NotImplementedError):
test_agg(ray_df, pandas_df, func, 1)
func = ['sum', lambda df: df.sum()]
with pytest.raises(NotImplementedError):
test_apply(ray_df, pandas_df, func, 0)
with pytest.raises(NotImplementedError):
test_aggregate(ray_df, pandas_df, func, 0)
with pytest.raises(NotImplementedError):
test_agg(ray_df, pandas_df, func, 0)
with pytest.raises(NotImplementedError):
test_apply(ray_df, pandas_df, func, 1)
with pytest.raises(NotImplementedError):
test_aggregate(ray_df, pandas_df, func, 1)
with pytest.raises(NotImplementedError):
test_agg(ray_df, pandas_df, func, 1)

test_transform(ray_df, pandas_df)
test_transform(ray_df, pandas_df)


@pytest.fixture
Expand Down

0 comments on commit 87ad3a6

Please sign in to comment.