Merge pull request #8841 from edx/clytwynec/TE-745

Fix for TE-745

common/test/acceptance/pages/studio/library.py

@@ -256,6 +256,9 @@ class StudioLibraryContainerXBlockWrapper(XBlockWrapper):
         self.q(css=btn_selector).first.click()
 
         # This causes a reload (see cms/static/xmodule_js/public/js/library_content_edit.js)
+        # Check that the ajax request that caused the reload is done.
+        self.wait_for_ajax()
+        # Then check that we are still on the right page.
         self.wait_for(lambda: self.is_browser_on_page(), 'StudioLibraryContainerXBlockWrapper has reloaded.')
         # Wait longer than the default 60 seconds, because this was intermittently failing on jenkins
         # with the screenshot showing that the Loading indicator was still visible. See TE-745.

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

@@ -2,7 +2,6 @@
 Acceptance tests for Library Content in LMS
 """
 import ddt
-from flaky import flaky
 from nose.plugins.attrib import attr
 import textwrap
 
@@ -138,7 +137,6 @@ class StudioLibraryContainerTest(StudioLibraryTest, UniqueCourseTest, TestWithSe
         self.assertIn(expected_text, library_container.validation_not_configured_warning_text)
         self.assertIn(expected_action, library_container.validation_not_configured_warning_text)
 
-    @flaky  # TODO fix this, see TE-745
     def test_out_of_date_message(self):
         """
         Scenario: Given I have a library, a course and library content xblock in a course
@@ -149,6 +147,7 @@ class StudioLibraryContainerTest(StudioLibraryTest, UniqueCourseTest, TestWithSe
         When I click on the update link
         Then I can see that the content no longer needs to be updated
         """
+        # Formerly flaky: see TE-745
         expected_text = "This component is out of date. The library has new content."
         library_block = self._get_library_xblock_wrapper(self.unit_page.xblocks[1])