Merge pull request #9287 from edx/release

Release
2015-08-12 13:06:39 -04:00
parent 5b9b0a8339 986564c45b
commit eafb07552a
26 changed files with 250 additions and 1280 deletions
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -1903,8 +1903,8 @@ class RerunCourseTest(ContentStoreTestCase):
        source_course = CourseFactory.create(advertised_start="01-12-2015")
        destination_course_key = self.post_rerun_request(source_course.id)
        destination_course = self.store.get_course(destination_course_key)
-        # Advertised_start is String field so it will return empty string if its not set
-        self.assertEqual('', destination_course.advertised_start)
+
+        self.assertEqual(None, destination_course.advertised_start)

    def test_rerun_of_rerun(self):
        source_course = CourseFactory.create()