PLAT-1943 Fix more naive datetime warnings

openedx/features/course_experience/tests/views/helpers.py

@@ -1,8 +1,9 @@
 """
 Test helpers for the course experience.
 """
+from datetime import timedelta
 
-import datetime
+from django.utils.timezone import now
 
 from course_modes.models import CourseMode
 
@@ -13,11 +14,11 @@ def add_course_mode(course, upgrade_deadline_expired=False):
     """
     Adds a course mode to the test course.
     """
-    upgrade_exp_date = datetime.datetime.now()
+    upgrade_exp_date = now()
     if upgrade_deadline_expired:
-        upgrade_exp_date = upgrade_exp_date - datetime.timedelta(days=21)
+        upgrade_exp_date = upgrade_exp_date - timedelta(days=21)
     else:
-        upgrade_exp_date = upgrade_exp_date + datetime.timedelta(days=21)
+        upgrade_exp_date = upgrade_exp_date + timedelta(days=21)
 
     CourseMode(
         course_id=course.id,

openedx/features/course_experience/tests/views/test_course_home.py

@@ -10,6 +10,7 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.http import QueryDict
 from django.utils.http import urlquote_plus
+from django.utils.timezone import now
 from pytz import UTC
 from waffle.models import Flag
 from waffle.testutils import override_flag
@@ -96,7 +97,7 @@ class CourseHomePageTestCase(SharedModuleStoreTestCase):
                     org='edX',
                     number='test',
                     display_name='Test Course',
-                    start=datetime.now(UTC) - timedelta(days=30),
+                    start=now() - timedelta(days=30),
                 )
                 with cls.store.bulk_operations(cls.course.id):
                     chapter = ItemFactory.create(
@@ -122,7 +123,7 @@ class CourseHomePageTestCase(SharedModuleStoreTestCase):
         """
         return CourseFactory.create(
             display_name='Test Future Course',
-            start=specific_date if specific_date else datetime.now(UTC) + timedelta(days=30),
+            start=specific_date if specific_date else now() + timedelta(days=30),
         )
 
 
@@ -487,9 +488,9 @@ class CourseHomeFragmentViewTests(ModuleStoreTestCase):
         super(CourseHomeFragmentViewTests, self).setUp()
         CommerceConfiguration.objects.create(checkout_on_ecommerce_service=True)
 
-        end = datetime.now(UTC) + timedelta(days=30)
+        end = now() + timedelta(days=30)
         self.course = CourseFactory(
-            start=datetime.now(UTC) - timedelta(days=30),
+            start=now() - timedelta(days=30),
             end=end,
         )
         self.url = course_home_url(self.course)
@@ -535,7 +536,7 @@ class CourseHomeFragmentViewTests(ModuleStoreTestCase):
         self.assert_upgrade_message_not_displayed()
 
     def test_no_upgrade_message_if_upgrade_deadline_passed(self):
-        self.verified_mode.expiration_datetime = datetime.now(UTC) - timedelta(days=20)
+        self.verified_mode.expiration_datetime = now() - timedelta(days=20)
         self.verified_mode.save()
         self.assert_upgrade_message_not_displayed()