From 87e2308801d9f79ec204ea9de90626c4676db54c Mon Sep 17 00:00:00 2001
From: "J. Cliff Dyer" <cdyer@edx.org>
Date: Fri, 14 Oct 2016 17:09:21 -0400
Subject: [PATCH] Added flaky tests.

New tickets:

    TNL-5770
    TNL-5771
    TNL-5772
    TNL-5773
    TNL-5774
    TNL-5775
---
 common/test/acceptance/tests/lms/test_conditional.py        | 4 ++++
 .../test/acceptance/tests/lms/test_lms_courseware_search.py | 2 ++
 common/test/acceptance/tests/lms/test_problem_types.py      | 6 ++++--
 .../test/acceptance/tests/studio/test_studio_course_info.py | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/test/acceptance/tests/lms/test_conditional.py b/common/test/acceptance/tests/lms/test_conditional.py
index 5329353154..e963a426cf 100644
--- a/common/test/acceptance/tests/lms/test_conditional.py
+++ b/common/test/acceptance/tests/lms/test_conditional.py
@@ -1,6 +1,9 @@
 """
 Bok choy acceptance tests for conditionals in the LMS
 """
+
+from flaky import flaky
+
 from capa.tests.response_xml_factory import StringResponseXMLFactory
 from common.test.acceptance.tests.helpers import UniqueCourseTest
 from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
@@ -112,6 +115,7 @@ class ConditionalTest(UniqueCourseTest):
         conditional_page = ConditionalPage(self.browser)
         self.assertTrue(conditional_page.is_content_visible())
 
+    @flaky  # TNL-5770
     def test_conditional_handles_polls(self):
         self.install_course_fixture(block_type='poll')
         self.courseware_page.visit()
diff --git a/common/test/acceptance/tests/lms/test_lms_courseware_search.py b/common/test/acceptance/tests/lms/test_lms_courseware_search.py
index c07479cf9a..d675efa0b6 100644
--- a/common/test/acceptance/tests/lms/test_lms_courseware_search.py
+++ b/common/test/acceptance/tests/lms/test_lms_courseware_search.py
@@ -3,6 +3,7 @@ Test courseware search
 """
 import json
 
+from flaky import flaky
 from nose.plugins.attrib import attr
 
 from common.test.acceptance.tests.helpers import UniqueCourseTest, remove_file
@@ -176,6 +177,7 @@ class CoursewareSearchTest(UniqueCourseTest):
         # Do the search again, this time we expect results.
         self.assertTrue(self._search_for_content(self.SEARCH_STRING))
 
+    @flaky  # TNL-5771
     def test_reindex(self):
         """
         Make sure new content gets reindexed on button press.
diff --git a/common/test/acceptance/tests/lms/test_problem_types.py b/common/test/acceptance/tests/lms/test_problem_types.py
index 7e337d3ae1..6343c696e8 100644
--- a/common/test/acceptance/tests/lms/test_problem_types.py
+++ b/common/test/acceptance/tests/lms/test_problem_types.py
@@ -6,8 +6,9 @@ See also lettuce tests in lms/djangoapps/courseware/features/problems.feature
 import random
 import textwrap
 
-from nose import SkipTest
 from abc import ABCMeta, abstractmethod
+from flaky import flaky
+from nose import SkipTest
 from nose.plugins.attrib import attr
 from selenium.webdriver import ActionChains
 
@@ -29,8 +30,8 @@ from capa.tests.response_xml_factory import (
 from common.test.acceptance.fixtures.course import XBlockFixtureDesc
 from common.test.acceptance.pages.lms.problem import ProblemPage
 from common.test.acceptance.tests.helpers import select_option_by_text
-from common.test.acceptance.tests.lms.test_lms_problems import ProblemsTest
 from common.test.acceptance.tests.helpers import EventsTestMixin
+from common.test.acceptance.tests.lms.test_lms_problems import ProblemsTest
 
 
 class ProblemTypeTestBaseMeta(ABCMeta):
@@ -291,6 +292,7 @@ class ProblemTypeTestMixin(object):
             self.answer_problem(correctness='incorrect')
             self.assertFalse(self.problem_page.is_save_notification_visible())
 
+    @flaky  # TNL-5774
     @attr(shard=7)
     def test_reset_clears_answer_and_focus(self):
         """
diff --git a/common/test/acceptance/tests/studio/test_studio_course_info.py b/common/test/acceptance/tests/studio/test_studio_course_info.py
index fbedfafc4d..c4c5cd29e7 100644
--- a/common/test/acceptance/tests/studio/test_studio_course_info.py
+++ b/common/test/acceptance/tests/studio/test_studio_course_info.py
@@ -109,6 +109,7 @@ class UsersCanAddUpdatesTest(StudioCourseTest):
         self.course_updates_page.click_new_update_save_button()
         self.assertTrue(self.course_updates_page.is_first_update_date('June 1, 2013'))
 
+    @flaky  # TNL-5775
     def test_outside_tag_preserved(self):
         """
         Scenario: Text outside of tags is preserved
@@ -123,6 +124,7 @@ class UsersCanAddUpdatesTest(StudioCourseTest):
         self.course_updates_page.visit()
         self.assertTrue(self.course_updates_page.is_first_update_message('before <strong>middle</strong> after'))
 
+    @flaky  # TNL-5773
     def test_asset_change_in_updates(self):
         """
         Scenario: Static links are rewritten when previewing a course update