From 06be2cfccd3a36e9b2147c925a25fd6efd6daa68 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Fri, 10 Sep 2021 15:43:28 +0500 Subject: [PATCH 1/2] fix: Updated the error message in test_bulk_change_enrollment --- .../student/management/tests/test_bulk_change_enrollment.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py b/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py index 9360bc6b86..0a10eca02f 100644 --- a/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py +++ b/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py @@ -5,6 +5,7 @@ from unittest.mock import call, patch import ddt import pytest +import django from django.core.management import call_command from django.core.management.base import CommandError @@ -106,7 +107,10 @@ class BulkChangeEnrollmentTests(SharedModuleStoreTestCase): commit=True, ) - assert 'Error: one of the arguments -c/--course -o/--org is required' == str(err.value) + if django.VERSION < (3,0): + assert 'Error: one of the arguments -c/--course -o/--org is required' == str(err.value) + else: + assert 'Error: argument -o/--org: not allowed with argument -c/--course' == str(err.value) @patch('common.djangoapps.student.models.tracker') def test_with_org_and_invalid_to_mode(self, mock_tracker): From 563f0a8462ec477295b5a94ffa335b73fb68386d Mon Sep 17 00:00:00 2001 From: Jawayria Date: Fri, 10 Sep 2021 16:58:13 +0500 Subject: [PATCH 2/2] fixed quality --- .../student/management/tests/test_bulk_change_enrollment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py b/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py index 0a10eca02f..a202eb35b0 100644 --- a/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py +++ b/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py @@ -107,7 +107,7 @@ class BulkChangeEnrollmentTests(SharedModuleStoreTestCase): commit=True, ) - if django.VERSION < (3,0): + if django.VERSION < (3, 0): assert 'Error: one of the arguments -c/--course -o/--org is required' == str(err.value) else: assert 'Error: argument -o/--org: not allowed with argument -c/--course' == str(err.value)