fix copy/paste mixups

pandas-dev · jreback · Dec 16, 2018 · Dec 15, 2018 · Dec 15, 2018 · Dec 15, 2018
commit 59cb98b71b24cc0c3129ffec16fb2c20216ff1fa
diff --git a/pandas/tests/frame/test_indexing.py b/pandas/tests/frame/test_indexing.py
@@ -3468,7 +3468,6 @@ def test_assigning_ops(self):
 
         #   - assign a complete row (mixed values) not in categories set
         with pytest.raises(ValueError):
-            np.log(s)
             df = orig.copy()
             df.iloc[2, :] = ["c", 2]
 

diff --git a/pandas/tests/indexing/test_partial.py b/pandas/tests/indexing/test_partial.py
@@ -200,7 +200,7 @@ def test_partial_setting_mixed_dtype(self):
         # list-like must conform
         df = DataFrame(columns=['A', 'B'])
 
-        with pytest.raises(IndexError):
+        with pytest.raises(ValueError):
             df.loc[0] = [1, 2, 3]
 
         # TODO: #15657, these are left as object and not coerced

diff --git a/pandas/tests/resample/test_resample_api.py b/pandas/tests/resample/test_resample_api.py
@@ -468,7 +468,7 @@ def test_agg_nested_dicts():
         def f():
             t.aggregate({'r1': {'A': ['mean', 'sum']},
                          'r2': {'B': ['mean', 'sum']}})
-        pytest.raises(ValueError, f)
+            pytest.raises(ValueError, f)
 
     for t in cases:
         expected = pd.concat([t['A'].mean(), t['A'].std(), t['B'].mean(),