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

pyautolib/pyauto.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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 2639 matching lines @@
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     cmd_dict = {
       'command': 'WaitForNotificationCount',
       'count': count,
     }
     self._GetResultFromJSONRequest(cmd_dict)
 
   def FindInPage(self, search_string, forward=True,
                  match_case=False, find_next=False,
-                 tab_index=0, windex=0):
+                 tab_index=0, windex=0, timeout=-1):

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

It's too bad ActionTimeoutChanger can't be used for this. Looking at the code,
it appears it's broken for any func that uses the json stuff.

[Nirnimesh, 2011/12/15 05:22:04]

I wasn't aware ActionTimeoutChanger is broken. I'm sure it's used in some other
places.

     """Find the match count for the given search string and search parameters.
     This is equivalent to using the find box.
 
     Args:
       search_string: The string to find on the page.
       forward: Boolean to set if the search direction is forward or backwards
       match_case: Boolean to set for case sensitive search.
       find_next: Boolean to set to continue the search or start from beginning.
       tab_index: The tab index, default is 0.
       window_index: The window index, default is 0.

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

add timeout here

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

Done.

 
     Returns:
       number of matches found for the given search string and parameters
     SAMPLE:
     { u'match_count': 10,
       u'match_left': 100,
       u'match_top': 100,
       u'match_right': 200,
       u'match_bottom': 200}
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     cmd_dict = {
       'command': 'FindInPage',
       'tab_index' : tab_index,
       'search_string' : search_string,
       'forward' : forward,
       'match_case' : match_case,
       'find_next' : find_next,
     }
-    return self._GetResultFromJSONRequest(cmd_dict, windex=windex)
+    return self._GetResultFromJSONRequest(cmd_dict, windex=windex,
+                                          timeout=timeout)
 
   def ExecuteJavascript(self, js, tab_index=0, windex=0, frame_xpath=''):
     """Executes a script in the specified frame of a tab.
 
     By default, execute the script in the top frame of the first tab in the
     first window. The invoked javascript function must send a result back via
     the domAutomationController.send function, or this function will never
     return.
 
     Args:
@@ skipping 2140 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()