Fix flakiness and re-enable http search in find_in_page.FindMatchTests.testSearchInPDF

functional/find_in_page.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import codecs
 import os
 import unittest
 
 import pyauto_functional
 import pyauto
+import pyauto_errors
 import test_utils
 
 
 class FindMatchTests(pyauto.PyUITest):
 
   # Data dir where all find test data files are kept
   find_test_data_dir = 'find_in_page'
 
   def testCanFindMatchCount(self):
     """Verify Find match count for valid search"""
@@ skipping 185 matching lines @@
     # Finding previous occurrence
     back_occurence_dict = self.FindInPage('2010 Pro Bowl',
                                           find_next = True, forward = False)
     self.assertEqual(first_occurence_dict, back_occurence_dict,
                      'We have only one occurrence in this page so '
                      'first and back search coordinates must be same')
 
   def _VerifySearchInPDFURL(self, url, word, expected_count):
     """Verify that we can find in a pdf file."""
     self.NavigateToURL(url)
-    search_count = self.FindInPage(word)['match_count']
+    # Check for JSONInterfaceError thrown when FindInPage called before page
+    # loaded.

[kkania, 2011/12/15 00:41:36]

Add an explanation about the bug and a reference to crbug.com/<bug#>

[vclarke1, 2011/12/15 00:52:09]

Done.

+    num_loops = 10
+    for loop in range(num_loops):
+      try:
+        search_count = self.FindInPage(word, timeout=1000)['match_count']
+        break
+      except pyauto_errors.JSONInterfaceError:
+        if loop == num_loops - 1:
+          raise
     self.assertEqual(expected_count, search_count,
                      'Failed to find in the %s pdf file' % url)
 
   def testSearchInPDF(self):
     """Verify that we can find in a pdf file.
 
     Only for Google Chrome builds (Chromium builds do not have internal pdf).
     """
     # bail out if not a branded build
     properties = self.GetBrowserInfo()['properties']
     if properties['branding'] != 'Google Chrome':
       return
     # Search in pdf file over file://.
     file_url = self.GetFileURLForDataPath('plugin', 'Embed.pdf')
     self._VerifySearchInPDFURL(file_url, 'adobe', 8) 
 
-    # Disabling this test crbug.com/70927 
     # Search in pdf file over http://.
-    # http_url = 'http://www.irs.gov/pub/irs-pdf/fw4.pdf'
-    # self._VerifySearchInPDFURL(http_url, 'Allowances', 16) 
+    http_url = 'http://www.irs.gov/pub/irs-pdf/fw4.pdf'
+    self._VerifySearchInPDFURL(http_url, 'Allowances', 16) 
 
 if __name__ == '__main__':
   pyauto_functional.Main()