Merge pull request #6964 from edx/zoldak/TE-745

Fix flaky library test TE-745

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

@@ -265,6 +265,12 @@ class StudioLibraryContainerXBlockWrapper(XBlockWrapper):
         """
         return self.q(css='article.content-primary').visible
 
+    def is_finished_loading(self):
+        """
+        Returns true iff the Loading indicator is not visible
+        """
+        return not self.q(css='div.ui-loading').visible
+
     @classmethod
     def from_xblock_wrapper(cls, xblock_wrapper):
         """
@@ -289,6 +295,7 @@ class StudioLibraryContainerXBlockWrapper(XBlockWrapper):
 
         # This causes a reload (see cms/static/xmodule_js/public/js/library_content_edit.js)
         self.wait_for(lambda: self.is_browser_on_page(), 'StudioLibraryContainerXBlockWrapper has reloaded.')
+        self.wait_for(lambda: self.is_finished_loading(), 'Loading indicator is not visible.')
 
         # And wait to make sure the ajax post has finished.
         self.wait_for_ajax()

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

 """
 Acceptance tests for Library Content in LMS
 """
-import textwrap
 import ddt
+import textwrap
 
 from .base_studio_test import StudioLibraryTest
 from ...fixtures.course import CourseFixture