Merge pull request #8330 from edx/mjevtic/SOL-835

(SOL-835) Addressing flakiness of the reindexing bokchoy acceptance test

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

@@ -207,6 +207,7 @@ def set_input_value_and_save(page, css, value):
     Sets the text field with given label (display name) to the specified value, and presses Save.
     """
     set_input_value(page, css, value).send_keys(Keys.ENTER)
+    page.wait_for_ajax()
 
 
 def drag(page, source_index, target_index, placeholder_height=0):

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

@@ -5,7 +5,6 @@ import os
 import json
 
 from nose.plugins.attrib import attr
-from flaky import flaky
 
 from ..helpers import UniqueCourseTest, remove_file
 from ...pages.common.logout import LogoutPage
@@ -177,7 +176,6 @@ class CoursewareSearchTest(UniqueCourseTest):
         # Do the search again, this time we expect results.
         self.assertTrue(self._search_for_content(self.SEARCH_STRING))
 
-    @flaky  # TODO fix SOL-835
     def test_reindex(self):
         """
         Make sure new content gets reindexed on button press.