Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated comment in test_join
GH21220
  • Loading branch information
KalyanGokhale committed Jun 15, 2018
commit 2d689ad8c643df95a3e0479d2da70ce351fb1e6c
5 changes: 2 additions & 3 deletions pandas/tests/reshape/merge/test_join.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,9 @@ def test_join_on_fails_with_different_column_counts(self):

def test_join_on_fails_with_wrong_object_type(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you parameterize this test

# GH12081
""" GH21220 - merging of Series and DataFrame is now allowed
Edited the test to remove the Series object from 'wrongly_typed'
"""
wrongly_typed = [2, 'str', None, np.array([0, 1])]
# GH21220 - merging of Series and DataFrame is now allowed
# Edited the test to remove the Series object from 'wrongly_typed'
df = DataFrame({'a': [1, 1]})

for obj in wrongly_typed:
Expand Down