Merge pull request #6669 from edx/clytwynec/disable_flaky_tests

Clytwynec/disable flaky tests

common/test/acceptance/tests/studio/test_studio_library_container.py

@@ -3,6 +3,8 @@ Acceptance tests for Library Content in LMS
 """
 import textwrap
 import ddt
+from unittest import skip
+
 from .base_studio_test import StudioLibraryTest
 from ...fixtures.course import CourseFixture
 from ..helpers import UniqueCourseTest
@@ -252,6 +254,7 @@ class StudioLibraryContainerTest(StudioLibraryTest, UniqueCourseTest):
             library_container.validation_warning_text
         )
 
+    @skip("Flaky: 01/16/2015")
     def test_settings_overrides(self):
         """
         Scenario: Given I have a library, a course and library content xblock in a course

common/test/acceptance/tests/studio/test_studio_settings_details.py

@@ -40,6 +40,7 @@ class SettingsMilestonesTest(StudioCourseTest):
 
         self.assertTrue(self.settings_detail.pre_requisite_course.present)
 
+    @skip("Flaky: 01/16/2015")
     def test_prerequisite_course_save_successfully(self):
         """
          Scenario: Selecting course from Pre-Requisite course drop down save the selected course as pre-requisite