Pep8 fixes for tests

lms/djangoapps/courseware/tests/test_access.py

@@ -15,7 +15,6 @@ import courseware.access as access
 from factories import CourseEnrollmentAllowedFactory
 
 
-
 class AccessTestCase(TestCase):
     def test__has_global_staff_access(self):
         u = Mock(is_staff=False)

lms/djangoapps/courseware/tests/test_module_render.py

@@ -27,10 +27,12 @@ from student.models import Registration
 
 from factories import UserFactory
 
+
 class Stub:
     def __init__(self):
         pass
 
+
 def xml_store_config(data_dir):
     return {
         'default': {
@@ -40,11 +42,12 @@ def xml_store_config(data_dir):
                 'default_class': 'xmodule.hidden_module.HiddenDescriptor',
             }
         }
-}
+    }
 
 TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
 
+
 @override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
 class ModuleRenderTestCase(PageLoader):
     def setUp(self):
@@ -54,8 +57,8 @@ class ModuleRenderTestCase(PageLoader):
         self.toy_course = modulestore().get_course(self.course_id)
 
     def test_get_module(self):
-        self.assertIsNone(render.get_module('dummyuser',None,\
-                                            'invalid location',None,None))
+        self.assertIsNone(render.get_module('dummyuser', None,
+                                            'invalid location', None, None))
 
     def test_get_instance_module(self):
         mock_user = MagicMock()
@@ -67,17 +70,17 @@ class ModuleRenderTestCase(PageLoader):
         mock_module = MagicMock()
         mock_module.descriptor.stores_state = False
         self.assertIsNone(render.get_instance_module('dummy', mock_user_2,
-                                                     mock_module,'dummy'))
+                                                     mock_module, 'dummy'))
 
     def test_modx_dispatch(self):
         self.assertRaises(Http404, render.modx_dispatch, 'dummy', 'dummy',
                           'invalid Location', 'dummy')
         mock_request = MagicMock()
         mock_request.FILES.keys.return_value = ['file_id']
-        mock_request.FILES.getlist.return_value = ['file']*(settings.MAX_FILEUPLOADS_PER_INPUT + 1)
+        mock_request.FILES.getlist.return_value = ['file'] * (settings.MAX_FILEUPLOADS_PER_INPUT + 1)
         self.assertEquals(render.modx_dispatch(mock_request, 'dummy', self.location,
                                           'dummy').content,
-                         json.dumps({'success': 'Submission aborted! Maximum %d files may be submitted at once' %\
+                         json.dumps({'success': 'Submission aborted! Maximum %d files may be submitted at once' %
                                      settings.MAX_FILEUPLOADS_PER_INPUT}))
         mock_request_2 = MagicMock()
         mock_request_2.FILES.keys.return_value = ['file_id']
@@ -88,8 +91,8 @@ class ModuleRenderTestCase(PageLoader):
         mock_request_2.FILES.getlist.return_value = filelist
         self.assertEquals(render.modx_dispatch(mock_request_2, 'dummy', self.location,
                                                'dummy').content,
-                          json.dumps({'success': 'Submission aborted! Your file "%s" is too large (max size: %d MB)' %\
-                                        (inputfile.name, settings.STUDENT_FILEUPLOAD_MAX_SIZE/(1000**2))}))
+                          json.dumps({'success': 'Submission aborted! Your file "%s" is too large (max size: %d MB)' %
+                                        (inputfile.name, settings.STUDENT_FILEUPLOAD_MAX_SIZE / (1000 ** 2))}))
         mock_request_3 = MagicMock()
         mock_request_3.POST.copy.return_value = {}
         mock_request_3.FILES = False
@@ -99,9 +102,9 @@ class ModuleRenderTestCase(PageLoader):
         inputfile_2.name = 'name'
         self.assertRaises(ItemNotFoundError, render.modx_dispatch,
                           mock_request_3, 'dummy', self.location, 'toy')
-        self.assertRaises(Http404,render.modx_dispatch, mock_request_3, 'dummy',
+        self.assertRaises(Http404, render.modx_dispatch, mock_request_3, 'dummy',
                             self.location, self.course_id)
-        mock_request_3.POST.copy.return_value = {'position':1}
+        mock_request_3.POST.copy.return_value = {'position': 1}
         self.assertIsInstance(render.modx_dispatch(mock_request_3, 'goto_position',
                             self.location, self.course_id), HttpResponse)
 
@@ -113,6 +116,7 @@ class ModuleRenderTestCase(PageLoader):
         self.assertEquals(render.get_score_bucket(11, 10), 'incorrect')
         self.assertEquals(render.get_score_bucket(-1, 10), 'incorrect')
 
+
 @override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
 class TestTOC(TestCase):
     """Check the Table of Contents for a course"""
@@ -172,4 +176,3 @@ class TestTOC(TestCase):
 
         actual = render.toc_for_course(self.portal_user, request, self.toy_course, chapter, section)
         self.assertEqual(expected, actual)
-

lms/djangoapps/courseware/tests/test_progress.py

@@ -3,7 +3,6 @@ from courseware import progress
 from mock import MagicMock
 
 
-
 class ProgessTests(TestCase):
         def setUp(self):
 
@@ -15,7 +14,7 @@ class ProgessTests(TestCase):
             'questions_total': 0})
 
                 self.c = progress.completion()
-		self.c2= progress.completion()
+                self.c2 = progress.completion()
                 self.c2.dict = dict({'duration_total': 0,
             'duration_watched': 0,
             'done': True,
@@ -52,7 +51,7 @@ class ProgessTests(TestCase):
 
         def test_setitem(self):
                 self.c.__setitem__('questions_correct', 4)
-		self.assertEqual(str(self.c),str(self.d))
+                self.assertEqual(str(self.c), str(self.d))
 
         def test_repr(self):
                 self.assertEqual(self.c.__repr__(), str(progress.completion()))

lms/djangoapps/courseware/tests/test_views.py

@@ -21,6 +21,7 @@ from xmodule.modulestore import Location
 
 from factories import UserFactory
 
+
 class Stub():
     pass
 
@@ -35,11 +36,12 @@ def xml_store_config(data_dir):
                 'default_class': 'xmodule.hidden_module.HiddenDescriptor',
             }
         }
-}
+    }
 
 TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
 
+
 @override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
 class TestJumpTo(TestCase):
     """Check the jumpto link for a course"""
@@ -64,15 +66,16 @@ class TestJumpTo(TestCase):
         response = self.client.get(jumpto_url)
         self.assertRedirects(response, expected, status_code=302, target_status_code=302)
 
+
 class ViewsTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create(username='dummy', password='123456',
                                         email='test@mit.edu')
-        self.date = datetime.datetime(2013,1,22)
+        self.date = datetime.datetime(2013, 1, 22)
         self.course_id = 'edX/toy/2012_Fall'
-        self.enrollment = CourseEnrollment.objects.get_or_create(user = self.user,
-                                                  course_id = self.course_id,
-                                                  created = self.date)[0]
+        self.enrollment = CourseEnrollment.objects.get_or_create(user=self.user,
+                                                  course_id=self.course_id,
+                                                  created=self.date)[0]
         self.location = ['tag', 'org', 'course', 'category', 'name']
         self._MODULESTORES = {}
         # This is a CourseDescriptor object
@@ -85,13 +88,13 @@ class ViewsTestCase(TestCase):
         # depreciated function
         mock_user = MagicMock()
         mock_user.is_authenticated.return_value = False
-        self.assertEquals(views.user_groups(mock_user),[])
+        self.assertEquals(views.user_groups(mock_user), [])
 
     def test_get_current_child(self):
         self.assertIsNone(views.get_current_child(Stub()))
         mock_xmodule = MagicMock()
         mock_xmodule.position = -1
-        mock_xmodule.get_display_items.return_value = ['one','two']
+        mock_xmodule.get_display_items.return_value = ['one', 'two']
         self.assertEquals(views.get_current_child(mock_xmodule), 'one')
         mock_xmodule_2 = MagicMock()
         mock_xmodule_2.position = 3

lms/djangoapps/courseware/tests/tests.py

@@ -64,7 +64,7 @@ def mongo_store_config(data_dir):
                 'render_template': 'mitxmako.shortcuts.render_to_string',
             }
         }
-}
+    }
 
 
 def draft_mongo_store_config(data_dir):
@@ -80,7 +80,7 @@ def draft_mongo_store_config(data_dir):
                 'render_template': 'mitxmako.shortcuts.render_to_string',
             }
         }
-}
+    }
 
 
 def xml_store_config(data_dir):
@@ -92,7 +92,7 @@ def xml_store_config(data_dir):
                 'default_class': 'xmodule.hidden_module.HiddenDescriptor',
             }
         }
-}
+    }
 
 TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
@@ -115,8 +115,7 @@ class ActivateLoginTestCase(TestCase):
                          'Response status code was {0} instead of 302'.format(response.status_code))
         url = response['Location']
 
-        e_scheme, e_netloc, e_path, e_query, e_fragment = urlsplit(
-                                                              expected_url)
+        e_scheme, e_netloc, e_path, e_query, e_fragment = urlsplit(expected_url)
         if not (e_scheme or e_netloc):
             expected_url = urlunsplit(('http', 'testserver', e_path,
                 e_query, e_fragment))
@@ -234,7 +233,6 @@ class PageLoader(ActivateLoginTestCase):
         data = parse_json(resp)
         self.assertTrue(data['success'])
 
-
     def check_for_get_code(self, code, url):
         """
         Check that we got the expected code when accessing url via GET.
@@ -246,7 +244,6 @@ class PageLoader(ActivateLoginTestCase):
                          .format(resp.status_code, url, code))
         return resp
 
-
     def check_for_post_code(self, code, url, data={}):
         """
         Check that we got the expected code when accessing url via POST.
@@ -258,12 +255,8 @@ class PageLoader(ActivateLoginTestCase):
                          .format(resp.status_code, url, code))
         return resp
 
-
-
     def check_pages_load(self, module_store):
         """Make all locations in course load"""
-
-
        # enroll in the course before trying to access pages
         courses = module_store.get_courses()
         self.assertEqual(len(courses), 1)
@@ -344,7 +337,6 @@ class PageLoader(ActivateLoginTestCase):
         self.assertTrue(all_ok)
 
 
-
 @override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
 class TestCoursesLoadTestCase_XmlModulestore(PageLoader):
     '''Check that all pages in test courses load properly'''
@@ -525,7 +517,6 @@ class TestViewAuth(PageLoader):
             print 'checking for 404 on {0}'.format(url)
             self.check_for_get_code(404, url)
 
-
         # now also make the instructor staff
         u = user(self.instructor)
         u.is_staff = True
@@ -536,7 +527,6 @@ class TestViewAuth(PageLoader):
             print 'checking for 200 on {0}'.format(url)
             self.check_for_get_code(200, url)
 
-
     def run_wrapped(self, test):
         """
         test.py turns off start dates.  Enable them.
@@ -552,7 +542,6 @@ class TestViewAuth(PageLoader):
         finally:
             settings.MITX_FEATURES['DISABLE_START_DATES'] = oldDSD
 
-
     def test_dark_launch(self):
         """Make sure that before course start, students can't access course
         pages, but instructors can"""
@@ -646,7 +635,6 @@ class TestViewAuth(PageLoader):
             url = reverse_urls(['courseware'], course)[0]
             self.check_for_get_code(302, url)
 
-
         # First, try with an enrolled student
         print '=== Testing student access....'
         self.login(self.student, self.password)
@@ -761,7 +749,6 @@ class TestViewAuth(PageLoader):
         self.assertTrue(has_access(student_user, self.toy, 'load'))
 
 
-
 @override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
 class TestCourseGrader(PageLoader):
     """Check that a course gets graded properly"""
@@ -832,8 +819,7 @@ class TestCourseGrader(PageLoader):
                             kwargs={
                                 'course_id': self.graded_course.id,
                                 'location': problem_location,
-                                'dispatch': 'problem_check', }
-                          )
+                                'dispatch': 'problem_check', })
 
         resp = self.client.post(modx_url, {
             'input_i4x-edX-graded-problem-{0}_2_1'.format(problem_url_name): responses[0],
@@ -854,8 +840,7 @@ class TestCourseGrader(PageLoader):
                             kwargs={
                                 'course_id': self.graded_course.id,
                                 'location': problem_location,
-                                'dispatch': 'problem_reset', }
-                          )
+                                'dispatch': 'problem_reset', })
 
         resp = self.client.post(modx_url)
         return resp