From a83e1fcab4215ab858c64188440ff3612d8b7222 Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Fri, 12 May 2023 17:14:23 +0530 Subject: [PATCH] fix: lint and other quality issues --- enterprise/api_client/lms.py | 10 +++++++++- enterprise/utils.py | 2 +- test_utils/fake_enrollment_api.py | 3 ++- tests/test_admin/test_view.py | 11 ++++++++++- tests/test_enterprise/api/test_views.py | 10 +++++----- tests/test_enterprise/api_client/test_lms.py | 3 ++- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/enterprise/api_client/lms.py b/enterprise/api_client/lms.py index ca08c2b499..cb06742e69 100644 --- a/enterprise/api_client/lms.py +++ b/enterprise/api_client/lms.py @@ -128,7 +128,15 @@ def has_course_mode(self, course_run_id, mode): course_modes = self.get_course_modes(course_run_id) return any(course_mode for course_mode in course_modes if course_mode['slug'] == mode) - def enroll_user_in_course(self, username, course_id, mode, cohort=None, enterprise_uuid=None, force_enrollment=False): + def enroll_user_in_course( + self, + username, + course_id, + mode, + cohort=None, + enterprise_uuid=None, + force_enrollment=False, + ): """ Call the enrollment API to enroll the user in the course specified by course_id. diff --git a/enterprise/utils.py b/enterprise/utils.py index c0458d960f..11176c668d 100644 --- a/enterprise/utils.py +++ b/enterprise/utils.py @@ -1702,7 +1702,7 @@ def enroll_user(enterprise_customer, user, course_mode, *course_ids, **kwargs): *course_ids: An iterable containing any number of course IDs to eventually enroll the user in. kwargs: Contains optional params such as: - enrollment_client, if it's already been instantiated and should be passed in - - force_enrollment, if the course is "Invite Only" and the "force_enrollment" is needed + - force_enrollment, if the course is "Invite Only" and the "force_enrollment" is needed Returns: Boolean: Whether or not enrollment succeeded for all courses specified diff --git a/test_utils/fake_enrollment_api.py b/test_utils/fake_enrollment_api.py index d06eaaf36b..7db03d5f80 100644 --- a/test_utils/fake_enrollment_api.py +++ b/test_utils/fake_enrollment_api.py @@ -150,7 +150,8 @@ def get_course_details(course_id): return None -def enroll_user_in_course(user, course_id, mode, cohort=None, enterprise_uuid=None, force_enrollment=False): +def enroll_user_in_course(user, course_id, mode, cohort=None, enterprise_uuid=None, force_enrollment=False): # pylint: disable=unused-argument + """ Fake implementation. """ diff --git a/tests/test_admin/test_view.py b/tests/test_admin/test_view.py index abee1d6d6b..006baf90bf 100644 --- a/tests/test_admin/test_view.py +++ b/tests/test_admin/test_view.py @@ -894,7 +894,16 @@ def test_post_existing_pending_record_with_another_enterprise_customer(self): self._test_post_existing_record_response(response) assert PendingEnterpriseCustomerUser.objects.filter(user_email=email).count() == 2 - def _enroll_user_request(self, user, mode, course_id="", notify=True, reason="tests", discount=0.0, force_enrollment=False): + def _enroll_user_request( + self, + user, + mode, + course_id="", + notify=True, + reason="tests", + discount=0.0, + force_enrollment=False + ): """ Perform post request to log in and submit the form to enroll a user. """ diff --git a/tests/test_enterprise/api/test_views.py b/tests/test_enterprise/api/test_views.py index 2128820b3d..10f287ef01 100644 --- a/tests/test_enterprise/api/test_views.py +++ b/tests/test_enterprise/api/test_views.py @@ -69,8 +69,8 @@ update_program_with_enterprise_context, ) from test_utils.factories import FAKER, EnterpriseCustomerUserFactory, PendingEnterpriseCustomerUserFactory, UserFactory -from test_utils.fake_enterprise_api import get_default_branding_object from test_utils.fake_enrollment_api import get_course_details +from test_utils.fake_enterprise_api import get_default_branding_object fake = Faker() @@ -4332,10 +4332,10 @@ def test_bulk_enrollment_in_bulk_courses_pending_licenses( self.assertEqual(len(PendingEnrollment.objects.all()), 0) - with mock.patch("enterprise.models.EnrollmentApiClient.get_course_details", wraps=get_course_details) as mock_client: - # mock_client = mock.Mock( - # get_course_details=get_course_details - # ) + with mock.patch( + "enterprise.models.EnrollmentApiClient.get_course_details", + wraps=get_course_details + ): response = self.client.post( settings.TEST_SERVER + ENTERPRISE_CUSTOMER_BULK_ENROLL_LEARNERS_IN_COURSES_ENDPOINT, data=json.dumps(body), diff --git a/tests/test_enterprise/api_client/test_lms.py b/tests/test_enterprise/api_client/test_lms.py index abaa1307d0..d15f27725b 100644 --- a/tests/test_enterprise/api_client/test_lms.py +++ b/tests/test_enterprise/api_client/test_lms.py @@ -99,7 +99,8 @@ def test_enroll_user_in_course(): 'mode': mode, 'cohort': cohort, 'is_active': True, - 'enterprise_uuid': 'None' + 'enterprise_uuid': 'None', + 'force_enrollment': False } responses.add( responses.POST,