Merge pull request #8470 from edx/benp/flag-flakies-jun2015

Flag test as flaky. See SOL-975

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

@@ -2,6 +2,7 @@
 Test course discovery.
 """
 import datetime
+from flaky import flaky
 import json
 import os
 
@@ -70,6 +71,7 @@ class CourseDiscoveryTest(WebAppTest):
         """
         self.page.visit()
 
+    @flaky  # TODO: fix this. See SOL-975
     def test_search(self):
         """
         Make sure you can search for courses.