Merge pull request #14065 from edx/cdyer/flakies-2016-11-29

Mark flaky tests flaky

common/lib/xmodule/xmodule/tests/test_capa_module.py

@@ -11,8 +11,9 @@ import random
 import os
 import textwrap
 import unittest
-import ddt
 
+import ddt
+import flaky
 from lxml import etree
 from mock import Mock, patch, DEFAULT
 import webob
@@ -1417,6 +1418,7 @@ class CapaModuleTest(unittest.TestCase):
         RANDOMIZATION.ALWAYS,
         RANDOMIZATION.ONRESET
     )
+    @flaky.flaky  # TNL-6041
     def test_random_seed_with_reset(self, rerandomize):
         """
         Run the test for each possible rerandomize value

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

@@ -5,6 +5,7 @@ progress page.
 """
 from contextlib import contextmanager
 import ddt
+import flaky
 from nose.plugins.attrib import attr
 
 from ..helpers import (
@@ -224,6 +225,7 @@ class PersistentGradesTest(ProgressPageBaseTest):
         _change_subsection_structure,
         _change_weight_for_problem
     )
+    @flaky.flaky  # TNL-6040
     def test_content_changes_do_not_change_score(self, edit):
         with self._logged_in_session():
             self.courseware_page.visit()

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

@@ -339,6 +339,7 @@ class TestCourseImport(ImportTestMixin, StudioCourseTest):
     def page_args(self):
         return [self.browser, self.course_info['org'], self.course_info['number'], self.course_info['run']]
 
+    @flaky  # TNL-6042
     def test_course_updated(self):
         """
         Given that I visit an empty course before import