Skip to content

Commit 94dab3b

Browse files
fix where/putmask tests
1 parent a553195 commit 94dab3b

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

pandas/tests/series/indexing/test_setitem.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -860,24 +860,16 @@ def test_index_where(self, obj, key, expected, raises, val):
860860
mask = np.zeros(obj.shape, dtype=bool)
861861
mask[key] = True
862862

863-
if raises and obj.dtype == "string":
864-
with pytest.raises(TypeError, match="Invalid value"):
865-
Index(obj).where(~mask, val)
866-
else:
867-
res = Index(obj).where(~mask, val)
868-
expected_idx = Index(expected, dtype=expected.dtype)
869-
tm.assert_index_equal(res, expected_idx)
863+
res = Index(obj).where(~mask, val)
864+
expected_idx = Index(expected, dtype=expected.dtype)
865+
tm.assert_index_equal(res, expected_idx)
870866

871867
def test_index_putmask(self, obj, key, expected, raises, val):
872868
mask = np.zeros(obj.shape, dtype=bool)
873869
mask[key] = True
874870

875-
if raises and obj.dtype == "string":
876-
with pytest.raises(TypeError, match="Invalid value"):
877-
Index(obj).putmask(mask, val)
878-
else:
879-
res = Index(obj).putmask(mask, val)
880-
tm.assert_index_equal(res, Index(expected, dtype=expected.dtype))
871+
res = Index(obj).putmask(mask, val)
872+
tm.assert_index_equal(res, Index(expected, dtype=expected.dtype))
881873

882874

883875
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)