From 2ee4b85ffc088fe60885ce3c97cb7cd32b4ce90a Mon Sep 17 00:00:00 2001
From: Ben Patterson <bpatterson@edx.org>
Date: Fri, 19 Jun 2015 20:17:29 -0400
Subject: [PATCH] Fix flaky test. SOL-975

Remove flaky flag, improve linting.
---
 common/test/acceptance/pages/lms/discovery.py          | 10 +++++++++-
 .../acceptance/tests/lms/test_lms_course_discovery.py  |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/test/acceptance/pages/lms/discovery.py b/common/test/acceptance/pages/lms/discovery.py
index 00547ccf9d..b8aea204cd 100644
--- a/common/test/acceptance/pages/lms/discovery.py
+++ b/common/test/acceptance/pages/lms/discovery.py
@@ -15,7 +15,15 @@ class CourseDiscoveryPage(PageObject):
     form = "#discovery-form"
 
     def is_browser_on_page(self):
-        return "Courses" in self.browser.title
+        """
+        Loading indicator must be present, but not visible
+        """
+        loading_css = "#loading-indicator"
+        courses_css = '.courses-listing'
+
+        return self.q(css=courses_css).visible \
+            and self.q(css=loading_css).present \
+            and not self.q(css=loading_css).visible
 
     @property
     def result_items(self):
diff --git a/common/test/acceptance/tests/lms/test_lms_course_discovery.py b/common/test/acceptance/tests/lms/test_lms_course_discovery.py
index 7f9231dcbd..084a15b4e5 100644
--- a/common/test/acceptance/tests/lms/test_lms_course_discovery.py
+++ b/common/test/acceptance/tests/lms/test_lms_course_discovery.py
@@ -72,7 +72,6 @@ class CourseDiscoveryTest(WebAppTest):
         """
         self.page.visit()
 
-    @flaky  # TODO: fix this. See SOL-975
     def test_search(self):
         """
         Make sure you can search for courses.