From 9429128776ac22ca6a5ceb5cdb316cad184c17ea Mon Sep 17 00:00:00 2001
From: Gabe Mulley <gabe@edx.org>
Date: Wed, 6 Sep 2017 11:56:52 -0400
Subject: [PATCH] do not create schedules for instructor led courses

---
 openedx/core/djangoapps/schedules/signals.py  | 23 ++++++++------
 .../schedules/tests/test_signals.py           | 31 ++++++-------------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/openedx/core/djangoapps/schedules/signals.py b/openedx/core/djangoapps/schedules/signals.py
index 380ff06c2a..f40f95e107 100644
--- a/openedx/core/djangoapps/schedules/signals.py
+++ b/openedx/core/djangoapps/schedules/signals.py
@@ -41,17 +41,20 @@ def create_schedule(sender, **kwargs):
         log.debug('Schedules: Creation not enabled for this course or for this site')
         return
 
-    delta = None
-    if enrollment.course_overview.self_paced:
-        global_config = DynamicUpgradeDeadlineConfiguration.current()
-        if global_config.enabled:
-            # Use the default from this model whether or not the feature is enabled
-            delta = global_config.deadline_days
+    if not enrollment.course_overview.self_paced:
+        log.debug('Schedules: Creation only enabled for self-paced courses')
+        return
 
-        # Check if the course has a deadline override
-        course_config = CourseDynamicUpgradeDeadlineConfiguration.current(enrollment.course_id)
-        if course_config.enabled:
-            delta = course_config.deadline_days
+    delta = None
+    global_config = DynamicUpgradeDeadlineConfiguration.current()
+    if global_config.enabled:
+        # Use the default from this model whether or not the feature is enabled
+        delta = global_config.deadline_days
+
+    # Check if the course has a deadline override
+    course_config = CourseDynamicUpgradeDeadlineConfiguration.current(enrollment.course_id)
+    if course_config.enabled:
+        delta = course_config.deadline_days
 
     upgrade_deadline = None
 
diff --git a/openedx/core/djangoapps/schedules/tests/test_signals.py b/openedx/core/djangoapps/schedules/tests/test_signals.py
index 798f0cad92..f879bdee19 100644
--- a/openedx/core/djangoapps/schedules/tests/test_signals.py
+++ b/openedx/core/djangoapps/schedules/tests/test_signals.py
@@ -21,12 +21,14 @@ from ..tests.factories import ScheduleConfigFactory
 class CreateScheduleTests(SharedModuleStoreTestCase):
 
     def assert_schedule_created(self):
-        enrollment = CourseEnrollmentFactory()
+        course = create_course_run(self_paced=True)
+        enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
         self.assertIsNotNone(enrollment.schedule)
         self.assertIsNone(enrollment.schedule.upgrade_deadline)
 
     def assert_schedule_not_created(self):
-        enrollment = CourseEnrollmentFactory()
+        course = create_course_run(self_paced=True)
+        enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
         with self.assertRaises(Schedule.DoesNotExist):
             enrollment.schedule
 
@@ -68,34 +70,19 @@ class CreateScheduleTests(SharedModuleStoreTestCase):
         site = SiteFactory.create()
         mock_get_current_site.return_value = site
         ScheduleConfigFactory.create(site=site, enabled=True, create_schedules=True)
-        course = create_self_paced_course_run()
-        DynamicUpgradeDeadlineConfiguration.objects.create(enabled=False)
+        course = create_course_run(self_paced=False)
         enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
-
-        self.assertEqual(enrollment.schedule.start, enrollment.created)
-        self.assertIsNone(enrollment.schedule.upgrade_deadline)
-
-    @override_waffle_flag(SCHEDULE_WAFFLE_FLAG, True)
-    def test_schedule_config_creation_enabled_instructor_paced_with_deadline(self, mock_get_current_site):
-        site = SiteFactory.create()
-        mock_get_current_site.return_value = site
-        ScheduleConfigFactory.create(site=site, enabled=True, create_schedules=True)
-        course = create_self_paced_course_run()
-        global_config = DynamicUpgradeDeadlineConfiguration.objects.create(enabled=True)
-        enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
-        expected_deadline = enrollment.created + datetime.timedelta(days=global_config.deadline_days)
-
-        self.assertEqual(enrollment.schedule.start, enrollment.created)
-        self.assertEqual(enrollment.schedule.upgrade_deadline, expected_deadline)
+        with self.assertRaises(Schedule.DoesNotExist):
+            enrollment.schedule
 
 
-def create_self_paced_course_run():
+def create_course_run(self_paced=True):
     """ Create a new course run and course modes.
 
     Both audit and verified `CourseMode` objects will be created for the course run.
     """
     now = datetime.datetime.now(utc)
-    course = CourseFactory.create(start=now + datetime.timedelta(days=-1), self_paced=True)
+    course = CourseFactory.create(start=now + datetime.timedelta(days=-1), self_paced=self_paced)
 
     CourseModeFactory(
         course_id=course.id,