Merge pull request #5865 from edx/benp/skip-broken-MA-117

Skip test broken on master. Sent to team for review.

lms/djangoapps/mobile_api/users/tests.py

@@ -4,6 +4,7 @@ Tests for users API
 
 import ddt
 from rest_framework.test import APITestCase
+from unittest import skip
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.django import modulestore
@@ -127,6 +128,7 @@ class TestUserApi(ModuleStoreTestCase, APITestCase):
         self.assertEqual(serialized['course']['number'], self.course.id.course)
         self.assertEqual(serialized['course']['org'], self.course.id.org)
 
+    @skip("Broken as part of a merge from release. See MA-117")
     def test_course_serializer_with_display_overrides(self):
         self.course.display_coursenumber = "overridden_number"
         self.course.display_organization = "overridden_org"