[CLN] parametrize and cleanup a bunch of tests #22093

jbrockmendel · 2018-07-28T04:00:58Z

No description provided.

pep8speaks · 2018-07-28T04:01:03Z

Hello @jbrockmendel! Thanks for updating the PR.

Cheers ! There are no PEP8 issues in this Pull Request. 🍻

Comment last updated on July 28, 2018 at 16:31 Hours UTC

jreback · 2018-07-28T12:48:29Z

pandas/tests/frame/test_analytics.py

@@ -74,29 +74,29 @@ def test_corr_non_numeric(self):
        tm.assert_frame_equal(result, expected)

    @td.skip_if_no_scipy
-    def test_corr_nooverlap(self):
+    @pytest.mark.parametrize('meth', ['pearson', 'kendall', 'spearman'])


should make this a fixture

jreback · 2018-07-28T12:48:41Z

pandas/tests/frame/test_analytics.py

@@ -658,21 +658,21 @@ def test_numeric_only_flag(self, meth):
        pytest.raises(TypeError, lambda: getattr(df2, meth)(
            axis=1, numeric_only=False))

-    def test_mixed_ops(self):
+    @pytest.mark.parametrize('op', ['mean', 'std', 'var',


do we have these as fixtures?

cython_table_items yields these (well it yields them all, maybe need to make a subset)

well it yields them all, maybe need to make a subset

Consider:

@pytest.mark.parametrize('op', SPECIFIC_EXPLICIT_LIST) def test_thing(self, op): def test_thing(self, cython_table_items): if cython_table_items not in SPECIFIC_EXPLICIT_LIST: return

There are good use cases for fixtures, this isn't near the top of that list.

jreback · 2018-07-28T12:49:17Z

pandas/tests/frame/test_axis_select_reindex.py

-                for fax in [0, 1]:
-                    self._check_align_fill('right', meth, ax, fax)
+    @pytest.mark.parametrize('meth', ['pad', 'bfill'])
+    @pytest.mark.parametrize('ax', [0, 1, None])


we have the axis arg as a fixture (though may need to add another one which adds None to it)

ok for sure need to use the fixture (but again can come back later on this)

jreback · 2018-07-28T12:49:34Z

pandas/tests/frame/test_axis_select_reindex.py

+    def test_align_fill_method_left(self, meth, ax, fax):
+        self._check_align_fill('left', meth, ax, fax)
+
+    @pytest.mark.parametrize('meth', ['pad', 'bfill'])


maybe add as a fixture (if these are named appropriately they immeditaly become obvious as fixtures)

I'll circle back to see what makes sense here. For now this can be reduced a bunch by parametrizing the first arg going into these four tests.

jreback · 2018-07-28T12:50:19Z

pandas/tests/frame/test_reshape.py

@@ -855,21 +855,21 @@ def _test_stack_with_multiindex(multiindex):
                             dtype=df.dtypes[0])
        assert_frame_equal(result, expected)

-    def test_stack_preserve_categorical_dtype(self):
+    @pytest.mark.parametrize('ordered', [False, True])


I think ordered is a fixture already

Not in conftest.

pandas/tests//arrays/categorical/conftest.py

maybe can simply move it to top level and use it

Honestly, I would love to create a helper in utils/testing.py to generate boolean fixtures like these. Not sure if it's possible, but just throwing it out there for thought.

jreback · 2018-07-28T12:50:48Z

pandas/tests/scalar/period/test_period.py

@@ -1038,9 +1038,10 @@ def test_add_raises(self):
            dt1 + dt2

    boxes = [lambda x: x, lambda x: pd.Series([x]), lambda x: pd.Index([x])]


maybe move these 2 lines to the top of the file?

If we use them more than once it makes sense, but ATM they are defined right next to where they are used, which is pretty ideal.

jreback · 2018-07-28T12:51:05Z

pandas/tests/series/test_alter_axes.py

@@ -245,7 +245,7 @@ def test_set_axis_inplace(self):
        expected = s.copy()
        expected.index = list('abcd')

-        for axis in 0, 'index':
+        for axis in [0, 'index']:


axis_series

jreback · 2018-07-28T12:51:38Z

pandas/tests/series/test_operators.py

@@ -1587,7 +1606,25 @@ def test_operators_reverse_object(self, op):
        expected = op(1., arr.astype(float))
        assert_series_equal(result.astype(float), expected)

-    def test_operators_combine(self):
+    pairings = []
+    for op in ['add', 'sub', 'mul', 'pow', 'truediv', 'floordiv']:


I think we already have these no as fixtures?

conftest.py doesn't have one specifically for this subset. Figuring out what is worth fixturizing will be much easier after arithmetic tests are centralized (#22033 and follow-ups)

sure we do, all_arithmetic_operators (and several slices of this)

See above re subsetting fixtures.

jreback · 2018-07-28T13:17:08Z

comments and pls rebase

…ol_ops4

codecov · 2018-07-28T20:47:40Z

Codecov Report

Merging #22093 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #22093      +/-   ##
==========================================
- Coverage   92.06%   92.05%   -0.01%     
==========================================
  Files         170      170              
  Lines       50705    50705              
==========================================
- Hits        46680    46678       -2     
- Misses       4025     4027       +2

Flag	Coverage Δ
#multiple	`90.46% <ø> (-0.01%)`	⬇️
#single	`42.3% <ø> (-0.01%)`	⬇️

Impacted Files	Coverage Δ
pandas/util/testing.py	`85.47% <0%> (-0.21%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0b7a08b...d7d2e26. Read the comment docs.

jreback · 2018-07-31T13:16:04Z

pandas/tests/frame/test_axis_select_reindex.py

-                for fax in [0, 1]:
-                    self._check_align_fill('right', meth, ax, fax)
+    @pytest.mark.parametrize('meth', ['pad', 'bfill'])
+    @pytest.mark.parametrize('ax', [0, 1, None])


ok for sure need to use the fixture (but again can come back later on this)

jreback · 2018-07-31T13:18:16Z

thanks

parametrize and cleanup a bunch of tests

de8348b

jbrockmendel added 3 commits July 27, 2018 21:05

Flake8 whitespace fixup

0b8f10b

xfail instead of commenting out

72f27d4

parametrize more

38e4e5a

jreback requested changes Jul 28, 2018

View reviewed changes

jreback added the Testing pandas testing functions or related to the test suite label Jul 28, 2018

jbrockmendel added 2 commits July 28, 2018 09:12

Merge branch 'master' of https://github.com/pandas-dev/pandas into bo…

32c5c83

…ol_ops4

use fixture, parametrize harder

d7d2e26

jreback added this to the 0.24.0 milestone Jul 31, 2018

jreback approved these changes Jul 31, 2018

View reviewed changes

jreback merged commit 8579101 into pandas-dev:master Jul 31, 2018

dberenbaum pushed a commit to dberenbaum/pandas that referenced this pull request Aug 3, 2018

[CLN] parametrize and cleanup a bunch of tests (pandas-dev#22093)

7e94b7e

jbrockmendel deleted the bool_ops4 branch August 8, 2018 15:52

Sup3rGeo pushed a commit to Sup3rGeo/pandas that referenced this pull request Oct 1, 2018

[CLN] parametrize and cleanup a bunch of tests (pandas-dev#22093)

4e0e1d1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CLN] parametrize and cleanup a bunch of tests #22093

[CLN] parametrize and cleanup a bunch of tests #22093

jbrockmendel commented Jul 28, 2018

pep8speaks commented Jul 28, 2018 •

edited

Loading

jreback Jul 28, 2018

jreback Jul 28, 2018

jbrockmendel Jul 28, 2018

jreback Jul 29, 2018

jbrockmendel Jul 30, 2018

jreback Jul 28, 2018

jreback Jul 31, 2018

jreback Jul 28, 2018

jbrockmendel Jul 28, 2018

jreback Jul 28, 2018

jbrockmendel Jul 28, 2018

jreback Jul 29, 2018

gfyoung Jul 30, 2018 •

edited

Loading

jreback Jul 28, 2018

jbrockmendel Jul 28, 2018

jreback Jul 28, 2018

jreback Jul 28, 2018

jbrockmendel Jul 28, 2018

jreback Jul 29, 2018

jbrockmendel Jul 30, 2018

jreback commented Jul 28, 2018

codecov bot commented Jul 28, 2018 •

edited

Loading

jreback Jul 31, 2018

jreback commented Jul 31, 2018

		@@ -1038,9 +1038,10 @@ def test_add_raises(self):
		dt1 + dt2

		boxes = [lambda x: x, lambda x: pd.Series([x]), lambda x: pd.Index([x])]

[CLN] parametrize and cleanup a bunch of tests #22093

[CLN] parametrize and cleanup a bunch of tests #22093

Conversation

jbrockmendel commented Jul 28, 2018

pep8speaks commented Jul 28, 2018 • edited Loading

Comment last updated on July 28, 2018 at 16:31 Hours UTC

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gfyoung Jul 30, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jreback commented Jul 28, 2018

codecov bot commented Jul 28, 2018 • edited Loading

Codecov Report

Choose a reason for hiding this comment

jreback commented Jul 31, 2018

pep8speaks commented Jul 28, 2018 •

edited

Loading

gfyoung Jul 30, 2018 •

edited

Loading

codecov bot commented Jul 28, 2018 •

edited

Loading