From e96e65a37793bd269c4ee6159c77930215b3100f Mon Sep 17 00:00:00 2001 From: Nimisha Asthagiri Date: Mon, 14 Dec 2015 10:07:24 -0500 Subject: [PATCH] generate_course_overview management command error handling --- .../management/commands/generate_course_overview.py | 6 +----- .../commands/tests/test_generate_course_overview.py | 9 ++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/openedx/core/djangoapps/content/course_overviews/management/commands/generate_course_overview.py b/openedx/core/djangoapps/content/course_overviews/management/commands/generate_course_overview.py index fb9de7ff57..48ae577092 100644 --- a/openedx/core/djangoapps/content/course_overviews/management/commands/generate_course_overview.py +++ b/openedx/core/djangoapps/content/course_overviews/management/commands/generate_course_overview.py @@ -33,7 +33,6 @@ class Command(BaseCommand): def handle(self, *args, **options): - course_keys = [] if options['all']: course_keys = [course.id for course in modulestore().get_courses()] else: @@ -42,9 +41,6 @@ class Command(BaseCommand): try: course_keys = [CourseKey.from_string(arg) for arg in args] except InvalidKeyError: - log.fatal('Invalid key specified.') - - if not course_keys: - log.fatal('No courses specified.') + raise CommandError('Invalid key specified.') CourseOverview.get_select_courses(course_keys) diff --git a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py index 7178b1c89c..025617e1ea 100644 --- a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py +++ b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py @@ -56,13 +56,12 @@ class TestGenerateCourseOverview(ModuleStoreTestCase): self._assert_courses_in_overview(self.course_key_1) self._assert_courses_not_in_overview(self.course_key_2) - @patch('openedx.core.djangoapps.content.course_overviews.management.commands.generate_course_overview.log') - def test_invalid_key(self, mock_log): + def test_invalid_key(self): """ - Test that invalid key errors are logged. + Test that CommandError is raised for invalid key. """ - self.command.handle('not/found', all=False) - self.assertTrue(mock_log.fatal.called) + with self.assertRaises(CommandError): + self.command.handle('not/found', all=False) @patch('openedx.core.djangoapps.content.course_overviews.models.log') def test_not_found_key(self, mock_log):