Fixing search_engines.SearchEnginesTest.testDiscoverSearchEngine

functional/test_utils.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 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 copy
 import email
 import os
 import smtplib
 import types
+import logging

[Nirnimesh, 2011/01/15 01:46:28]

In dictionary order, logging goes before types, smtplib, os; after copy, email

 
 import pyauto_functional
+import pyauto
 import pyauto_utils
 
 
 """Commonly used functions for PyAuto tests."""
 
 def DownloadFileFromDownloadsDataDir(test, file_name):
   """Download a file from downloads data directory, in first tab first window.
 
   Args:
     test: derived from pyauto.PyUITest - base class for UI test cases
@@ skipping 184 matching lines @@
 
   Args:
     content_string: string to search for within content
     have_list: list of strings found within content
     nothave_list: list of strings not found within content
   """
   for s in have_list:
     test.assertTrue(s in content_string, s)
   for s in nothave_list:
     test.assertTrue(s not in content_string)
+
+
+def _CallFunctionWithNewTimeout(self, new_timeout, function):

[Nirnimesh, 2011/01/15 01:46:28]

Now that it's a helper function to be used in multiple test scripts, you don't
need _ prefix any more.

+  """Sets the timeout to |new_timeout| and calls |function|.
+
+  This method resets the timeout before returning.
+  """
+  timeout_changer = pyauto.PyUITest.CmdExecutionTimeoutChanger(
+      self, new_timeout)
+  logging.info('Automation execution timeout has been changed to %d. '
+               'If the timeout is large the test might appear to hang.'
+               % new_timeout)
+  function()
+  del timeout_changer