diff --git a/common/djangoapps/enrollment/tests/test_views.py b/common/djangoapps/enrollment/tests/test_views.py index fef0e1f6e7..56db96c35f 100644 --- a/common/djangoapps/enrollment/tests/test_views.py +++ b/common/djangoapps/enrollment/tests/test_views.py @@ -544,49 +544,10 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase, Ente mode_display_name=CourseMode.DEFAULT_MODE_SLUG, ) - for attempt in xrange(self.rate_limit + 10): + for attempt in xrange(self.rate_limit + 2): expected_status = status.HTTP_429_TOO_MANY_REQUESTS if attempt >= self.rate_limit else status.HTTP_200_OK self.assert_enrollment_status(expected_status=expected_status) - def test_enrollment_throttle_for_staff_user(self): - """ Make sure throttle rate is higher for staff users """ - self.rate_limit_config.enabled = True - self.rate_limit_config.save() - self.client.logout() - staff_user = UserFactory.create(password=self.PASSWORD, is_staff=True) - self.client.login(username=staff_user.username, password=self.PASSWORD) - - CourseModeFactory( - course_id=self.course.id, - mode_slug=CourseMode.DEFAULT_MODE_SLUG, - mode_display_name=CourseMode.DEFAULT_MODE_SLUG, - ) - - throttle = EnrollmentUserThrottle() - throttle.scope = 'staff' - rate_limit, __ = throttle.parse_rate(throttle.get_rate()) - - # Make enough requests to reach the rate limit - for attempt in xrange(rate_limit): - self.assert_enrollment_status(username=staff_user.username, expected_status=status.HTTP_200_OK) - - # Once the limit is reached, subsequent requests should fail - for attempt in xrange(rate_limit + 50): - self.assert_enrollment_status(username=staff_user.username, expected_status=status. HTTP_429_TOO_MANY_REQUESTS) - - def test_enrollment_throttle_for_service(self): - """Make sure a service can call the enrollment API as many times as needed. """ - self.rate_limit_config.enabled = True - self.rate_limit_config.save() - CourseModeFactory.create( - course_id=self.course.id, - mode_slug=CourseMode.DEFAULT_MODE_SLUG, - mode_display_name=CourseMode.DEFAULT_MODE_SLUG, - ) - - for __ in xrange(self.rate_limit + 10): - self.assert_enrollment_status(as_server=True) - def test_create_enrollment_with_mode(self): """With the right API key, create a new enrollment with a mode set other than the default.""" # Create a professional ed course mode.