Merge pull request #12513 from edx/christina/mark-flaky-tests

Christina/mark flaky tests

common/test/acceptance/tests/lms/test_lms_edxnotes.py

@@ -13,6 +13,7 @@ from ...pages.lms.course_nav import CourseNavPage
 from ...pages.lms.courseware import CoursewarePage
 from ...pages.lms.edxnotes import EdxNotesUnitPage, EdxNotesPage, EdxNotesPageNoContent
 from ...fixtures.edxnotes import EdxNotesFixture, Note, Range
+from flaky import flaky
 
 
 class EdxNotesTestMixin(UniqueCourseTest):
@@ -841,6 +842,7 @@ class EdxNotesPageTest(EventsTestMixin, EdxNotesTestMixin):
 
         self.assert_viewed_event('Tags')
 
+    @flaky  # TNL-4590
     def test_easy_access_from_notes_page(self):
         """
         Scenario: Ensure that the link to the Unit works correctly.

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

@@ -6,7 +6,6 @@ from flaky import flaky
 from nose.plugins.attrib import attr
 from unittest import skip
 
-from .base_studio_test import StudioCourseTest
 from ...fixtures.config import ConfigModelFixture
 from ...fixtures.course import CourseFixture
 from ...pages.studio.settings import SettingsPage
@@ -50,6 +49,7 @@ class SettingsMilestonesTest(StudioSettingsDetailsTest):
 
         self.assertTrue(self.settings_detail.pre_requisite_course_options)
 
+    @flaky  # SOL-1811
     def test_prerequisite_course_save_successfully(self):
         """
          Scenario: Selecting course from Pre-Requisite course drop down save the selected course as pre-requisite