Commit 1e0f3ddb by Sarina Canelake

s/pylint: disable=E1111,E1124/pylint: disable=assignment-from-no-return,redundant-keyword-arg/

parent b4d24f36
...@@ -62,7 +62,7 @@ class PipelineEnrollmentTest(ModuleStoreTestCase): ...@@ -62,7 +62,7 @@ class PipelineEnrollmentTest(ModuleStoreTestCase):
strategy = self._fake_strategy() strategy = self._fake_strategy()
strategy.session_set('enroll_course_id', unicode(self.course.id)) strategy.session_set('enroll_course_id', unicode(self.course.id))
result = pipeline.change_enrollment(strategy, 1, user=self.user) # pylint: disable=E1111,E1124 result = pipeline.change_enrollment(strategy, 1, user=self.user) # pylint: disable=assignment-from-no-return,redundant-keyword-arg
self.assertEqual(result, {}) self.assertEqual(result, {})
# Check that the user was or was not enrolled # Check that the user was or was not enrolled
...@@ -86,7 +86,7 @@ class PipelineEnrollmentTest(ModuleStoreTestCase): ...@@ -86,7 +86,7 @@ class PipelineEnrollmentTest(ModuleStoreTestCase):
# Simulate the pipeline step for enrolling in this course # Simulate the pipeline step for enrolling in this course
strategy = self._fake_strategy() strategy = self._fake_strategy()
strategy.session_set('enroll_course_id', unicode(self.course.id)) strategy.session_set('enroll_course_id', unicode(self.course.id))
result = pipeline.change_enrollment(strategy, 1, user=self.user) # pylint: disable=E1111,E1124 result = pipeline.change_enrollment(strategy, 1, user=self.user) # pylint: disable=assignment-from-no-return,redundant-keyword-arg
self.assertEqual(result, {}) self.assertEqual(result, {})
# Expect that the uesr is NOT enrolled in the course # Expect that the uesr is NOT enrolled in the course
...@@ -109,7 +109,7 @@ class PipelineEnrollmentTest(ModuleStoreTestCase): ...@@ -109,7 +109,7 @@ class PipelineEnrollmentTest(ModuleStoreTestCase):
# This should fail silently, with no exception # This should fail silently, with no exception
strategy = self._fake_strategy() strategy = self._fake_strategy()
strategy.session_set('enroll_course_id', unicode(self.course.id)) strategy.session_set('enroll_course_id', unicode(self.course.id))
result = pipeline.change_enrollment(strategy, 1, user=self.user) # pylint: disable=E1111,E1124 result = pipeline.change_enrollment(strategy, 1, user=self.user) # pylint: disable=assignment-from-no-return,redundant-keyword-arg
self.assertEqual(result, {}) self.assertEqual(result, {})
# Verify that we were NOT enrolled # Verify that we were NOT enrolled
...@@ -117,7 +117,7 @@ class PipelineEnrollmentTest(ModuleStoreTestCase): ...@@ -117,7 +117,7 @@ class PipelineEnrollmentTest(ModuleStoreTestCase):
def test_no_course_id_skips_enroll(self): def test_no_course_id_skips_enroll(self):
strategy = self._fake_strategy() strategy = self._fake_strategy()
result = pipeline.change_enrollment(strategy, 1, user=self.user) # pylint: disable=E1111,E1124 result = pipeline.change_enrollment(strategy, 1, user=self.user) # pylint: disable=assignment-from-no-return,redundant-keyword-arg
self.assertEqual(result, {}) self.assertEqual(result, {})
self.assertFalse(CourseEnrollment.is_enrolled(self.user, self.course.id)) self.assertFalse(CourseEnrollment.is_enrolled(self.user, self.course.id))
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
""" """
Unit tests for instructor.api methods. Unit tests for instructor.api methods.
""" """
# pylint: disable=E1111
import unittest import unittest
import json import json
import requests import requests
...@@ -111,26 +111,26 @@ class TestCommonExceptions400(unittest.TestCase): ...@@ -111,26 +111,26 @@ class TestCommonExceptions400(unittest.TestCase):
def test_user_doesnotexist(self): def test_user_doesnotexist(self):
self.request.is_ajax.return_value = False self.request.is_ajax.return_value = False
resp = view_user_doesnotexist(self.request) resp = view_user_doesnotexist(self.request) # pylint: disable=assignment-from-no-return
self.assertEqual(resp.status_code, 400) self.assertEqual(resp.status_code, 400)
self.assertIn("User does not exist", resp.content) self.assertIn("User does not exist", resp.content)
def test_user_doesnotexist_ajax(self): def test_user_doesnotexist_ajax(self):
self.request.is_ajax.return_value = True self.request.is_ajax.return_value = True
resp = view_user_doesnotexist(self.request) resp = view_user_doesnotexist(self.request) # pylint: disable=assignment-from-no-return
self.assertEqual(resp.status_code, 400) self.assertEqual(resp.status_code, 400)
result = json.loads(resp.content) result = json.loads(resp.content)
self.assertIn("User does not exist", result["error"]) self.assertIn("User does not exist", result["error"])
def test_alreadyrunningerror(self): def test_alreadyrunningerror(self):
self.request.is_ajax.return_value = False self.request.is_ajax.return_value = False
resp = view_alreadyrunningerror(self.request) resp = view_alreadyrunningerror(self.request) # pylint: disable=assignment-from-no-return
self.assertEqual(resp.status_code, 400) self.assertEqual(resp.status_code, 400)
self.assertIn("Task is already running", resp.content) self.assertIn("Task is already running", resp.content)
def test_alreadyrunningerror_ajax(self): def test_alreadyrunningerror_ajax(self):
self.request.is_ajax.return_value = True self.request.is_ajax.return_value = True
resp = view_alreadyrunningerror(self.request) resp = view_alreadyrunningerror(self.request) # pylint: disable=assignment-from-no-return
self.assertEqual(resp.status_code, 400) self.assertEqual(resp.status_code, 400)
result = json.loads(resp.content) result = json.loads(resp.content)
self.assertIn("Task is already running", result["error"]) self.assertIn("Task is already running", result["error"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment