Merge pull request #3828 from edx/ammar/flaky-for-video-tests

Flaky for Bok-Choy Video Tests

common/test/acceptance/tests/test_video_module.py

@@ -13,6 +13,7 @@ from ..pages.lms.course_nav import CourseNavPage
 from ..pages.lms.auto_auth import AutoAuthPage
 from ..pages.lms.course_info import CourseInfoPage
 from ..fixtures.course import CourseFixture, XBlockFixtureDesc
+from box.test.flaky import flaky
 
 VIDEO_SOURCE_PORT = 8777
 YOUTUBE_STUB_PORT = 9080
@@ -36,6 +37,7 @@ class YouTubeConfigError(Exception):
     pass
 
 
+@flaky
 class VideoBaseTest(UniqueCourseTest):
     """
     Base class for tests of the Video Player

rakelib/bok_choy.rake

@@ -147,7 +147,7 @@ def run_bok_choy(test_spec)
     # Construct the nosetests command, specifying where to save screenshots and XUnit XML reports
     cmd = [
         "SCREENSHOT_DIR='#{BOK_CHOY_LOG_DIR}'", "nosetests", test_spec,
-        "--with-xunit", "--xunit-file=#{BOK_CHOY_XUNIT_REPORT}", "--verbosity=2"
+        "--with-xunit", "--with-flaky", "--xunit-file=#{BOK_CHOY_XUNIT_REPORT}", "--verbosity=2"
     ]
 
     # Configure parallel test execution, if specified

requirements/edx/base.txt

@@ -124,6 +124,7 @@ rednose==0.3
 selenium==2.39.0
 splinter==0.5.4
 testtools==0.9.34
+flaky==0.2.0
 
 git+https://github.com/mfogel/django-settings-context-processor.git