Merge pull request #6432 from open-craft/annual-test-failures

Fix two tests failing on January 1, 2015

common/test/acceptance/tests/lms/test_lms_courseware.py

@@ -67,7 +67,7 @@ class CoursewareTest(UniqueCourseTest):
 
         """
         self.course_outline.q(css=".subsection-header-actions .configure-button").first.click()
-        self.course_outline.q(css="#start_date").fill("01/01/2015")
+        self.course_outline.q(css="#start_date").fill("01/01/2030")
         self.course_outline.q(css=".action-save").first.click()
 
     def _auto_auth(self, username, email, staff):

openedx/core/djangoapps/user_api/tests/test_profile_api.py

@@ -7,6 +7,7 @@ import ddt
 from django.test.utils import override_settings
 from nose.tools import raises
 from dateutil.parser import parse as parse_datetime
+from pytz import UTC
 from xmodule.modulestore.tests.factories import CourseFactory
 import datetime
 
@@ -167,7 +168,7 @@ class ProfileApiTest(TestCase):
         # Set year of birth
         user = User.objects.get(username=self.USERNAME)
         profile = UserProfile.objects.get(user=user)
-        year_of_birth = datetime.datetime.now().year - age  # pylint: disable=maybe-no-member
+        year_of_birth = datetime.datetime.now(UTC).year - age  # pylint: disable=maybe-no-member
         profile.year_of_birth = year_of_birth
         profile.save()