parameterize tests, define fixture where it is used

Author: jbrockmendel

pandas/tests/tseries/conftest.py

@@ -1,10 +1,4 @@
 import pytest
-import pandas.tseries.offsets as offsets
-
-
-@pytest.fixture(params=[getattr(offsets, o) for o in offsets.__all__])
-def offset_types(request):
-    return request.param
 
 
 @pytest.fixture(params=[None, 'UTC', 'Asia/Tokyo', 'US/Eastern',

pandas/tests/tseries/test_offsets.py

@@ -42,6 +42,16 @@
 from pandas.tseries.holiday import USFederalHolidayCalendar
 
 
+offset_classes = [getattr(offsets, x) for x in dir(offsets)]
+offset_classes = [x for x in offset_classes if inspect.isclass(x) and
+                  issubclass(x, DateOffset)]
+
+
+@pytest.fixture(params=offset_classes)
+def offset_types(request):
+    return request.param
+
+
 def test_monthrange():
     import calendar
     for y in range(2000, 2013):
@@ -4904,23 +4914,15 @@ def test_all_offset_classes(self):
 
 # ---------------------------------------------------------------------
 
-offset_classes = [getattr(offsets, x) for x in dir(offsets)]
-offset_classes = [x for x in offset_classes if inspect.isclass(x) and
-                  issubclass(x, DateOffset)]
+month_classes = [x for x in offset_classes if
+                 issubclass(x, offsets.MonthOffset)]
+
+tick_classes = [x for x in offset_classes if issubclass(x, offsets.Tick)]
 
 
-def test_valid_attributes():
+@pytest.parametrize('cls', month_classes+tick_classes)
+@pytest.parametrize('kwd', _rd_kwds)
+def test_valid_attributes(kwd, cls):
     # check that we cannot create e.g. MonthEnd(weeks=3)
-    month_classes = [x for x in offset_classes if
-                     issubclass(x, offsets.MonthOffset)]
-
-    for cls in month_classes:
-        for kwd in _rd_kwds:
-            with pytest.raises(TypeError):
-                cls(**{kwd: 3})
-
-    tick_classes = [x for x in offset_classes if issubclass(x, offsets.Tick)]
-    for cls in tick_classes:
-        for kwd in _rd_kwds:
-            with pytest.raises(TypeError):
-                cls(**{kwd: 4})
+    with pytest.raises(TypeError):
+        cls(**{kwd: 3})