Skip to content

Commit

Permalink
Fixes some tests caused by Pandas changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jiffyclub committed Jun 16, 2015
2 parents 88a5014 + a36eea2 commit 15bfcdd
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
10 changes: 6 additions & 4 deletions orca/server/tests/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ def test_table_groupbyagg_level_mean(tapp):

pdt.assert_series_equal(
test,
pd.Series([70, 85], index=['a', 'b']))
pd.Series([70, 85], index=['a', 'b'], name='b'))


def test_table_groupbyagg_level_median(tapp):
Expand All @@ -382,7 +382,7 @@ def test_table_groupbyagg_level_median(tapp):

pdt.assert_series_equal(
test,
pd.Series([70, 85], index=['a', 'b']))
pd.Series([70, 85], index=['a', 'b'], name='b'))


def test_table_groupbyagg_level_sum(tapp):
Expand All @@ -394,7 +394,7 @@ def test_table_groupbyagg_level_sum(tapp):

pdt.assert_series_equal(
test,
pd.Series([70, 170], index=['a', 'b']))
pd.Series([70, 170], index=['a', 'b'], name='b'))


def test_table_groupbyagg_level_std(tapp):
Expand All @@ -406,4 +406,6 @@ def test_table_groupbyagg_level_std(tapp):

pdt.assert_series_equal(
test,
pd.Series([pd.np.nan, pd.Series([80, 90]).std()], index=['a', 'b']))
pd.Series(
[pd.np.nan, pd.Series([80, 90]).std()],
index=['a', 'b'], name='b'))
9 changes: 5 additions & 4 deletions orca/tests/test_orca.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,14 +353,15 @@ def test_update_col(df):
wrapped = orca.add_table('table', df)

wrapped.update_col('b', pd.Series([7, 8, 9], index=df.index))
pdt.assert_series_equal(wrapped['b'], pd.Series([7, 8, 9], index=df.index))
pdt.assert_series_equal(
wrapped['b'], pd.Series([7, 8, 9], index=df.index, name='b'))

wrapped.update_col_from_series('a', pd.Series([]))
pdt.assert_series_equal(wrapped['a'], df['a'])

wrapped.update_col_from_series('a', pd.Series([99], index=['y']))
pdt.assert_series_equal(
wrapped['a'], pd.Series([1, 99, 3], index=df.index))
wrapped['a'], pd.Series([1, 99, 3], index=df.index, name='a'))


class _FakeTable(object):
Expand Down Expand Up @@ -637,7 +638,7 @@ def step(table, column):
table_wr = orca.get_table('table').to_frame()

pdt.assert_frame_equal(table_wr[['a', 'b']], df)
pdt.assert_series_equal(table_wr['new'], column())
pdt.assert_series_equal(table_wr['new'], pd.Series(column(), name='new'))


def test_injectables_cache():
Expand Down Expand Up @@ -919,7 +920,7 @@ def year_key(y):
return '{}'.format(y)

def series_year(y):
return pd.Series([y] * 3, index=df.index)
return pd.Series([y] * 3, index=df.index, name=str(y))

@orca.step()
def step(iter_var, table):
Expand Down

0 comments on commit 15bfcdd

Please sign in to comment.