Separate tick tests, use pytest parametrize

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/offsets/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

pandas/tests/tseries/offsets/common.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+"""
+Assertion helpers for offsets tests
+"""
+
+
+def assert_offset_equal(offset, base, expected):
+    actual = offset + base
+    actual_swapped = base + offset
+    actual_apply = offset.apply(base)
+    try:
+        assert actual == expected
+        assert actual_swapped == expected
+        assert actual_apply == expected
+    except AssertionError:
+        raise AssertionError("\nExpected: %s\nActual: %s\nFor Offset: %s)"
+                             "\nAt Date: %s" %
+                             (expected, actual, offset, base))
+
+
+def assert_onOffset(offset, date, expected):
+    actual = offset.onOffset(date)
+    assert actual == expected, ("\nExpected: %s\nActual: %s\nFor Offset: %s)"
+                                "\nAt Date: %s" %
+                                (expected, actual, offset, date))

pandas/tests/tseries/offsets/conftest.py

@@ -0,0 +1,13 @@
+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',
+                        'dateutil/Asia/Tokyo', 'dateutil/US/Pacific'])
+def tz(request):
+    return request.param