Minor fixes in index and scalar tests

Author: cbertinato

pandas/tests/indexes/datetimes/test_ops.py

@@ -168,14 +168,13 @@ def test_numpy_minmax(self):
         ('1823-01-01 00:00:01.000000012', 'ceil', '10ns',
          '1823-01-01 00:00:01.000000020')
     ])
-    # @pytest.mark.parametrize('tz', tz)
-    def test_round_ops(self, test_input, rounder, freq, expected):
-        for tz in self.tz:
-            index = pd.DatetimeIndex([test_input], tz=tz)
-            func = getattr(index, rounder)
-            result = func(freq)
-            expect = pd.DatetimeIndex([expected], tz=tz)
-            tm.assert_index_equal(result, expect)
+    @pytest.mark.parametrize('tz', tz)
+    def test_round_ops(self, test_input, rounder, freq, expected, tz):
+        index = pd.DatetimeIndex([test_input], tz=tz)
+        func = getattr(index, rounder)
+        result = func(freq)
+        expect = pd.DatetimeIndex([expected], tz=tz)
+        tm.assert_index_equal(result, expect)
 
     def test_round_daily(self):
         dti = pd.date_range('20130101 09:10:11', periods=5)

pandas/tests/scalar/test_timestamp.py

@@ -745,46 +745,48 @@ def test_to_pydatetime_nonzero_nano(self):
             assert result == expected
 
     @pytest.mark.parametrize('test_input, rounder, freq, expected, kw', [
-        ('20130101 09:10:11', 'floor', 'D', '20130101', {}),
+        ('20130101 09:10:11', 'floor', 'D', '20130101', None),
         # GH 19206 - times far in the future and past rounding incorrectly
-        ('2117-01-01 00:00:45', 'floor', '15s', '2117-01-01 00:00:45', {}),
-        ('2117-01-01 00:00:45', 'ceil', '15s', '2117-01-01 00:00:45', {}),
+        ('2117-01-01 00:00:45', 'floor', '15s', '2117-01-01 00:00:45', None),
+        ('2117-01-01 00:00:45', 'ceil', '15s', '2117-01-01 00:00:45', None),
         ('2117-01-01 00:00:45.000000012', 'floor', '10ns',
-         '2117-01-01 00:00:45.000000010', {}),
-        ('1823-01-01 00:00:01', 'floor', '1s', '1823-01-01 00:00:01', {}),
-        ('1823-01-01 00:00:01', 'ceil', '1s', '1823-01-01 00:00:01', {}),
+         '2117-01-01 00:00:45.000000010', None),
+        ('1823-01-01 00:00:01', 'floor', '1s', '1823-01-01 00:00:01', None),
+        ('1823-01-01 00:00:01', 'ceil', '1s', '1823-01-01 00:00:01', None),
         ('1823-01-01 00:00:01.000000012', 'floor', '10ns',
-         '1823-01-01 00:00:01.000000010', {}),
+         '1823-01-01 00:00:01.000000010', None),
         ('1823-01-01 00:00:01.000000012', 'ceil', '10ns',
-         '1823-01-01 00:00:01.000000020', {}),
+         '1823-01-01 00:00:01.000000020', None),
         # ----
-        ('20130101 09:10:11', 'ceil', 'D', '20130102', {}),
-        ('20130101 09:10:11', 'round', 'D', '20130101', {}),
-        ('20130101 19:10:11', 'round', 'D', '20130102', {}),
-        ('20130201 12:00:00', 'round', 'D', '20130202', {}),
-        ('20130104 12:00:00', 'round', 'D', '20130105', {}),
-        ('20130104 12:32:00', 'round', '30Min', '20130104 12:30:00', {}),
+        ('20130101 09:10:11', 'ceil', 'D', '20130102', None),
+        ('20130101 09:10:11', 'round', 'D', '20130101', None),
+        ('20130101 19:10:11', 'round', 'D', '20130102', None),
+        ('20130201 12:00:00', 'round', 'D', '20130202', None),
+        ('20130104 12:00:00', 'round', 'D', '20130105', None),
+        ('20130104 12:32:00', 'round', '30Min', '20130104 12:30:00', None),
         # round with tz
         ('20130101 09:10:11', 'round', 'D', '20130101', {'tz': 'US/Eastern'}),
         ('20130101 09:10:11', 'round', 's', '20130101 09:10:11',
          {'tz': 'US/Eastern'}),
         # GH 14440 & 15578
         ('2016-10-17 12:00:00.0015', 'round', 'ms',
-         '2016-10-17 12:00:00.002000', {}),
+         '2016-10-17 12:00:00.002000', None),
         ('2016-10-17 12:00:00.00149', 'round', 'ms',
-         '2016-10-17 12:00:00.001000', {}),
+         '2016-10-17 12:00:00.001000', None),
         ('2016-10-17 12:00:00.0015', 'round', 'us',
-         '2016-10-17 12:00:00.0015', {}),
+         '2016-10-17 12:00:00.0015', None),
         ('2016-10-17 12:00:00.0015', 'round', 'ns',
-         '2016-10-17 12:00:00.0015', {}),
+         '2016-10-17 12:00:00.0015', None),
         ('2016-10-17 12:00:00.001501031', 'round', '10ns',
-         '2016-10-17 12:00:00.001501030', {}),
-        ('2000-01-05 05:09:15.13', 'round', 'D', '2000-01-05 00:00:00', {}),
-        ('2000-01-05 05:09:15.13', 'round', 'H', '2000-01-05 05:00:00', {}),
-        ('2000-01-05 05:09:15.13', 'round', 'S', '2000-01-05 05:09:15', {})
+         '2016-10-17 12:00:00.001501030', None),
+        ('2000-01-05 05:09:15.13', 'round', 'D', '2000-01-05 00:00:00', None),
+        ('2000-01-05 05:09:15.13', 'round', 'H', '2000-01-05 05:00:00', None),
+        ('2000-01-05 05:09:15.13', 'round', 'S', '2000-01-05 05:09:15', None)
 
     ])
     def test_round_timestamp(self, test_input, rounder, freq, expected, kw):
+        if kw is None:
+            kw = {}
         dt = Timestamp(test_input, **kw)
         func = getattr(dt, rounder)
         result = func(freq)