Merge branch 'peter-fogg/remove-video-xml' of github.com:edx/edx-platform into…

Merge branch 'peter-fogg/remove-video-xml' of github.com:edx/edx-platform into peter-fogg/remove-video-xml

lms/djangoapps/courseware/tests/test_module_render.py

@@ -127,6 +127,7 @@ class ModuleRenderTestCase(LoginEnrollmentTestCase):
 class TestTOC(TestCase):
     """Check the Table of Contents for a course"""
     def setUp(self):
+        self.maxDiff = None
 
         # Toy courses should be loaded
         self.course_name = 'edX/toy/2012_Fall'