Rebase and adjust tests

Author: mroeschke

pandas/tests/indexes/datetimes/test_misc.py

@@ -245,9 +245,16 @@ def test_datetimeindex_accessors(self):
     @pytest.mark.skipif(not tm.get_locales(), reason='No available locales')
     @pytest.mark.parametrize('time_locale', tm.get_locales() + [None])
     def test_datetime_name_accessors(self, time_locale):
-        with tm.set_locale(time_locale, locale.LC_TIME):
-            expected_days = calendar.day_name[:]
-            expected_months = calendar.month_name[1:]
+        if time_locale is None:
+            expected_days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday',
+                             'Friday', 'Saturday', 'Sunday']
+            expected_months = ['January', 'February', 'March', 'April', 'May',
+                               'June', 'July', 'August', 'September',
+                               'October', 'November', 'December']
+        else:
+            with tm.set_locale(time_locale, locale.LC_TIME):
+                expected_days = calendar.day_name[:]
+                expected_months = calendar.month_name[1:]
 
         # GH 11128
         dti = DatetimeIndex(freq='D', start=datetime(1998, 1, 1),

pandas/tests/scalar/timestamp/test_timestamp.py

@@ -4,6 +4,7 @@
 import pytest
 import dateutil
 import calendar
+import locale
 import numpy as np
 
 from dateutil.tz import tzutc
@@ -95,13 +96,28 @@ def check(value, equal):
         for end in ends:
             assert getattr(ts, end)
 
-    @pytest.mark.parametrize('data, expected',
-                             [(Timestamp('2017-08-28 23:00:00'), 'Monday'),
-                              (Timestamp('2017-08-28 23:00:00', tz='EST'),
-                               'Monday')])
-    def test_weekday_name(self, data, expected):
+    # GH 12806
+    @pytest.mark.skipif(not tm.get_locales(), reason='No available locales')
+    @pytest.mark.parametrize('data',
+                             [Timestamp('2017-08-28 23:00:00'),
+                              Timestamp('2017-08-28 23:00:00', tz='EST')])
+    @pytest.mark.parametrize('time_locale', tm.get_locales() + [None])
+    def test_names(self, data, time_locale):
         # GH 17354
-        assert data.weekday_name == expected
+        # Test .weekday_name, .day_name(), .month_name
+        with tm.assert_produces_warning(DeprecationWarning,
+                                        check_stacklevel=False):
+            assert data.weekday_name == 'Monday'
+        if time_locale is None:
+            expected_day = 'Monday'
+            expected_month = 'August'
+        else:
+            with tm.set_locale(time_locale, locale.LC_TIME):
+                expected_day = calendar.day_name[0].capitalize()
+                expected_month = calendar.month_name[8].capitalize()
+
+        assert data.day_name(time_locale) == expected_day
+        assert data.month_name(time_locale) == expected_month
 
     @pytest.mark.parametrize('tz', [None, 'UTC', 'US/Eastern', 'Asia/Tokyo'])
     def test_is_leap_year(self, tz):