diff --git a/common/djangoapps/student/management/commands/bulk_unenroll.py b/common/djangoapps/student/management/commands/bulk_unenroll.py index e09d3bb437..4faffa9aac 100644 --- a/common/djangoapps/student/management/commands/bulk_unenroll.py +++ b/common/djangoapps/student/management/commands/bulk_unenroll.py @@ -37,7 +37,7 @@ class Command(BaseCommand): '-p', '--csv_path', metavar='csv_path', dest='csv_path', - required=True, + required=False, help='Path to CSV file.') parser.add_argument( '--commit', diff --git a/common/djangoapps/student/management/tests/test_bulk_unenroll.py b/common/djangoapps/student/management/tests/test_bulk_unenroll.py index d953d69155..664eddbfe5 100644 --- a/common/djangoapps/student/management/tests/test_bulk_unenroll.py +++ b/common/djangoapps/student/management/tests/test_bulk_unenroll.py @@ -58,7 +58,7 @@ class BulkUnenrollTests(SharedModuleStoreTestCase): csv = self._write_test_csv(csv, lines=["amy,test_course\n"]) with LogCapture(LOGGER_NAME) as log: - call_command("bulk_unenroll", "--csv_path={} --commit".format(csv.name)) + call_command("bulk_unenroll", "--csv_path={}".format(csv.name), "--commit") expected_message = 'Invalid course id {}, skipping un-enrollement.'.\ format('test_course') @@ -76,7 +76,7 @@ class BulkUnenrollTests(SharedModuleStoreTestCase): with NamedTemporaryFile() as csv: csv = self._write_test_csv(csv, lines=lines) - call_command("bulk_unenroll", "--csv_path={} --commit".format(csv.name)) + call_command("bulk_unenroll", "--csv_path={}".format(csv.name), "--commit") for enrollment in CourseEnrollment.objects.all(): self.assertEqual(enrollment.is_active, False) @@ -106,7 +106,7 @@ class BulkUnenrollTests(SharedModuleStoreTestCase): csv_file = SimpleUploadedFile(name='test.csv', content=lines.encode('utf-8'), content_type='text/csv') BulkUnenrollConfiguration.objects.create(enabled=True, csv_file=csv_file) - call_command("bulk_unenroll --commit") + call_command("bulk_unenroll", "--commit") for enrollment in CourseEnrollment.objects.all(): self.assertEqual(enrollment.is_active, False) @@ -117,14 +117,20 @@ class BulkUnenrollTests(SharedModuleStoreTestCase): csv_file = SimpleUploadedFile(name='test.csv', content=lines.encode('utf-8'), content_type='text/csv') BulkUnenrollConfiguration.objects.create(enabled=True, csv_file=csv_file) + course_id = self.enrollments[0].course.id with LogCapture(LOGGER_NAME) as log: - call_command("bulk_unenroll --commit") + call_command("bulk_unenroll", "--commit") log.check( + ( + LOGGER_NAME, + 'INFO', + 'Processing [{}] with [1] enrollments.'.format(course_id), + ), ( LOGGER_NAME, 'INFO', 'User [{}] have been successfully unenrolled from the course: {}'.format( self.enrollments[0].username, self.enrollments[0].course.id ) - ) + ), )