|
5 | 5 | from django.test.utils import override_settings |
6 | 6 | from django.urls import reverse |
7 | 7 | from opaque_keys.edx.keys import CourseKey |
8 | | -from pytz import common_timezones_set |
| 8 | +from pytz import common_timezones_set, common_timezones, country_timezones |
9 | 9 |
|
10 | 10 | from openedx.core.djangoapps.django_comment_common import models |
11 | 11 | from openedx.core.djangolib.testing.utils import CacheIsolationTestCase, skip_unless_lms |
@@ -634,13 +634,16 @@ def _assert_time_zone_is_valid(self, time_zone_info): |
634 | 634 | assert time_zone_name in common_timezones_set |
635 | 635 | assert time_zone_info['description'] == get_display_time_zone(time_zone_name) |
636 | 636 |
|
637 | | - # The time zones count may need to change each time we upgrade pytz |
638 | | - @ddt.data((ALL_TIME_ZONES_URI, 432), |
639 | | - (COUNTRY_TIME_ZONES_URI, 23)) |
640 | | - @ddt.unpack |
641 | | - def test_get_basic(self, country_uri, expected_count): |
| 637 | + def test_get_country_timezones(self): |
| 638 | + """ Verify that correct time zone info is returned """ |
| 639 | + results = self.get_json(self.COUNTRY_TIME_ZONES_URI) |
| 640 | + assert len(results) == len(country_timezones['cA']) |
| 641 | + for time_zone_info in results: |
| 642 | + self._assert_time_zone_is_valid(time_zone_info) |
| 643 | + |
| 644 | + def test_get_all_common_timezones(self): |
642 | 645 | """ Verify that correct time zone info is returned """ |
643 | | - results = self.get_json(country_uri) |
644 | | - assert len(results) == expected_count |
| 646 | + results = self.get_json(self.ALL_TIME_ZONES_URI) |
| 647 | + assert len(results) == len(common_timezones) |
645 | 648 | for time_zone_info in results: |
646 | 649 | self._assert_time_zone_is_valid(time_zone_info) |
0 commit comments