Move test_no_course_overview into the schedules management command base test class

openedx/core/djangoapps/schedules/management/commands/tests/test_send_recurring_nudge.py

@@ -55,31 +55,6 @@ class TestSendRecurringNudge(ScheduleBaseEmailTestBase):
     expected_offsets = (-3, -10)
 
     @patch.object(tested_task, 'async_send_task')
-    def test_no_course_overview(self, mock_schedule_send):
-        schedule = ScheduleFactory.create(
-            start=datetime.datetime(2017, 8, 3, 20, 34, 30, tzinfo=pytz.UTC),
-            enrollment__user=UserFactory.create(),
-        )
-        schedule.enrollment.course_id = CourseKey.from_string('edX/toy/Not_2012_Fall')
-        schedule.enrollment.save()
-
-        test_datetime = datetime.datetime(2017, 8, 3, 20, tzinfo=pytz.UTC)
-        test_datetime_str = serialize(test_datetime)
-        for b in range(resolvers.RECURRING_NUDGE_NUM_BINS):
-            with self.assertNumQueries(NUM_QUERIES_NO_MATCHING_SCHEDULES + NUM_QUERIES_NO_ORG_LIST, table_blacklist=WAFFLE_TABLES):
-                self.tested_task.apply(kwargs=dict(
-                    site_id=self.site_config.site.id, target_day_str=test_datetime_str, day_offset=-3, bin_num=b
-                ))
-
-        # There is no database constraint that enforces that enrollment.course_id points
-        # to a valid CourseOverview object. However, in that case, schedules isn't going
-        # to attempt to address it, and will instead simply skip those users.
-        # This happens 'transparently' because django generates an inner-join between
-        # enrollment and course_overview, and thus will skip any rows where course_overview
-        # is null.
-        self.assertEqual(mock_schedule_send.apply_async.call_count, 0)
-
-    @patch.object(tested_task, 'async_send_task')
     def test_send_after_course_end(self, mock_schedule_send):
         user1 = UserFactory.create(id=resolvers.RECURRING_NUDGE_NUM_BINS)
 

openedx/core/djangoapps/schedules/management/commands/tests/test_send_upgrade_reminder.py

@@ -72,32 +72,6 @@ class TestUpgradeReminder(ScheduleBaseEmailTestBase):
             expiration_datetime=datetime.datetime.now(pytz.UTC) + datetime.timedelta(days=30),
         )
 
-    @patch.object(tested_task, 'async_send_task')
-    def test_no_course_overview(self, mock_schedule_send):
-
-        schedule = ScheduleFactory.create(
-            upgrade_deadline=datetime.datetime(2017, 8, 3, 20, 34, 30, tzinfo=pytz.UTC),
-        )
-        schedule.enrollment.course_id = CourseKey.from_string('edX/toy/Not_2012_Fall')
-        schedule.enrollment.save()
-
-        test_datetime = datetime.datetime(2017, 8, 3, 20, tzinfo=pytz.UTC)
-        test_datetime_str = serialize(test_datetime)
-        for b in range(resolvers.UPGRADE_REMINDER_NUM_BINS):
-
-            with self.assertNumQueries(NUM_QUERIES_NO_MATCHING_SCHEDULES + NUM_QUERIES_NO_ORG_LIST, table_blacklist=WAFFLE_TABLES):
-                self.tested_task.apply(kwargs=dict(
-                    site_id=self.site_config.site.id, target_day_str=test_datetime_str, day_offset=2, bin_num=b,
-                ))
-
-        # There is no database constraint that enforces that enrollment.course_id points
-        # to a valid CourseOverview object. However, in that case, schedules isn't going
-        # to attempt to address it, and will instead simply skip those users.
-        # This happens 'transparently' because django generates an inner-join between
-        # enrollment and course_overview, and thus will skip any rows where course_overview
-        # is null.
-        self.assertEqual(mock_schedule_send.apply_async.call_count, 0)
-
     @patch.object(tasks, 'ace')
     def test_delivery_disabled(self, mock_ace):
         ScheduleConfigFactory.create(site=self.site_config.site, deliver_upgrade_reminder=False)

openedx/core/djangoapps/schedules/management/commands/tests/tools.py

@@ -8,7 +8,7 @@ import pytz
 
 from courseware.models import DynamicUpgradeDeadlineConfiguration
 from edx_ace.utils.date import serialize
-from opaque_keys.edx.locator import CourseLocator
+from opaque_keys.edx.keys import CourseKey
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.site_configuration.tests.factories import SiteConfigurationFactory, SiteFactory
 from openedx.core.djangoapps.schedules import resolvers, tasks
@@ -156,3 +156,31 @@ class ScheduleBaseEmailTestBase(SharedModuleStoreTestCase):
 
             self.assertEqual(mock_schedule_send.apply_async.call_count, schedule_count)
             self.assertFalse(mock_ace.send.called)
+
+    def test_no_course_overview(self):
+        current_day, offset, target_day = self._get_dates()
+        schedule = ScheduleFactory.create(
+            start=target_day,
+            upgrade_deadline=target_day,
+            enrollment__course__self_paced=True,
+        )
+        schedule.enrollment.course_id = CourseKey.from_string('edX/toy/Not_2012_Fall')
+        schedule.enrollment.save()
+
+        with patch.object(self.tested_task, 'async_send_task') as mock_schedule_send:
+            for b in range(self.tested_task.num_bins):
+                self.tested_task.apply(kwargs=dict(
+                    site_id=self.site_config.site.id,
+                    target_day_str=serialize(target_day),
+                    day_offset=offset,
+                    bin_num=b,
+                ))
+
+        # There is no database constraint that enforces that enrollment.course_id points
+        # to a valid CourseOverview object. However, in that case, schedules isn't going
+        # to attempt to address it, and will instead simply skip those users.
+        # This happens 'transparently' because django generates an inner-join between
+        # enrollment and course_overview, and thus will skip any rows where course_overview
+        # is null.
+        self.assertEqual(mock_schedule_send.apply_async.call_count, 0)
+