From 90e3e4b3b24e3623c44d7b9eda141261d83b62a1 Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Tue, 25 Feb 2020 18:11:17 -0800 Subject: [PATCH 1/2] troubleshoot 32187 --- pandas/tests/indexing/test_floats.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pandas/tests/indexing/test_floats.py b/pandas/tests/indexing/test_floats.py index 4d3f1b0539aee..7b544a7c48660 100644 --- a/pandas/tests/indexing/test_floats.py +++ b/pandas/tests/indexing/test_floats.py @@ -32,19 +32,7 @@ def check(self, result, original, indexer, getitem): tm.assert_almost_equal(result, expected) - @pytest.mark.parametrize( - "index_func", - [ - tm.makeStringIndex, - tm.makeUnicodeIndex, - tm.makeCategoricalIndex, - tm.makeDateIndex, - tm.makeTimedeltaIndex, - tm.makePeriodIndex, - tm.makeIntIndex, - tm.makeRangeIndex, - ], - ) + @pytest.mark.parametrize("index_func", tm.all_index_generator(5)) def test_scalar_error(self, index_func): # GH 4892 @@ -54,7 +42,7 @@ def test_scalar_error(self, index_func): # but is specifically testing for the error # message - i = index_func(5) + i = index_func s = Series(np.arange(len(i)), index=i) From 2d1133fe26d2bad0452dbcee69005407d853d671 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 2 Mar 2020 13:23:01 +0000 Subject: [PATCH 2/2] use series_with_simple_index fixture --- pandas/tests/indexing/test_floats.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pandas/tests/indexing/test_floats.py b/pandas/tests/indexing/test_floats.py index 8c99abc179409..18b9898e7d800 100644 --- a/pandas/tests/indexing/test_floats.py +++ b/pandas/tests/indexing/test_floats.py @@ -40,8 +40,7 @@ def check(self, result, original, indexer, getitem): tm.assert_almost_equal(result, expected) - @pytest.mark.parametrize("index_func", tm.all_index_generator(5)) - def test_scalar_error(self, index_func): + def test_scalar_error(self, series_with_simple_index): # GH 4892 # float_indexers should raise exceptions @@ -50,11 +49,9 @@ def test_scalar_error(self, index_func): # but is specifically testing for the error # message - i = index_func + s = series_with_simple_index - s = Series(np.arange(len(i)), index=i) - - msg = "Cannot index by location index" + msg = "Cannot index by location index with a non-integer key" with pytest.raises(TypeError, match=msg): s.iloc[3.0]