Review: pytest.parameterize and normal assert_frame_equal

Author: Connor Charles

pandas/tests/test_expressions.py

@@ -1,4 +1,3 @@
-from itertools import product
 import operator
 import re
 
@@ -319,7 +318,6 @@ def testit():
             for f in [self.frame, self.frame2, self.mixed, self.mixed2]:
 
                 for cond in [True, False]:
-
                     c = np.empty(f.shape, dtype=np.bool_)
                     c.fill(cond)
                     result = expr.where(c, f.values, f.values + 1)
@@ -433,11 +431,10 @@ def test_bool_ops_column_name_dtype(self, test_input, expected):
         result = test_input.loc[:, ["a", "dtype"]].ne(test_input.loc[:, ["a", "dtype"]])
         assert_frame_equal(result, expected)
 
-    @pytest.mark.parametrize(
-        "axis,arith", product((0, 1), ("add", "sub", "mul", "mod", "truediv"))
-    )
+    # Can't check floordiv here because it currently doesn't work #GH27636
+    @pytest.mark.parametrize("arith", ("add", "sub", "mul", "mod", "truediv"))
+    @pytest.mark.parametrize("axis", (0, 1))
     def test_frame_series_axis(self, axis, arith):
-        # Can't check floordiv here because it currently doesn't work #GH27636
         df = self.frame
         if axis == 1:
             other = self.frame.iloc[0, :]
@@ -454,8 +451,4 @@ def test_frame_series_axis(self, axis, arith):
         expr.set_use_numexpr(True)
 
         result = op(df, other)
-        try:
-            assert_frame_equal(expected, result)
-        except Exception:
-            pprint_thing("Failed test with operator {op.__name__!r}".format(op=op))
-            raise
+        assert_frame_equal(expected, result)