Skip to content

Commit

Permalink
COMPAT: windows test compat for merge, xref #13170
Browse files Browse the repository at this point in the history
  • Loading branch information
jreback committed May 27, 2016
1 parent e8d9e79 commit ae2ca83
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pandas/tools/tests/test_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ def test_intelligently_handle_join_key(self):
expected = DataFrame({'key': [1, 1, 1, 1, 2, 2, 3, 4, 5],
'value': np.array([0, 0, 1, 1, 2, 3, 4,
np.nan, np.nan]),
'rvalue': np.array([0, 1, 0, 1, 2, 2, 3, 4, 5])},
'rvalue': [0, 1, 0, 1, 2, 2, 3, 4, 5]},
columns=['value', 'key', 'rvalue'])
assert_frame_equal(joined, expected)

Expand Down

0 comments on commit ae2ca83

Please sign in to comment.