Set url fetch test timeout back to old values. Increase UI test command timeo...

chrome/test/pyautolib/pyauto.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.
 
 """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,
@@ skipping 220 matching lines @@
     EXAMPLES:-
     Wait for "file.txt" to get created:
       WaitUntil(os.path.exists, args=["file.txt"])
 
     Same as above, but using lambda:
       WaitUntil(lambda: os.path.exists("file.txt"))
 
     Args:
       function: the function whose truth value is to be evaluated
       timeout: the max timeout (in secs) for which to wait. The default
-               action is to wait for 60secs, and can be changed by
-               changing kWaitForActionMaxMsec in ui_test.cc.
+               action is to wait for kWaitForActionMaxMsec, as set in
+               ui_test.cc
                Use None to wait indefinitely.
       retry_sleep: the sleep interval (in secs) before retrying |function|.
-                   Deaults to 0.25 secs.
+                   Defaults to 0.25 secs.
       args: the args to pass to |function|
 
     Returns:
       True, if returning when |function| evaluated to True
       False, when returning due to timeout
     """
     if timeout == -1:  # Default
       timeout = self.action_max_timeout_ms()/1000.0
     assert callable(function), "function should be a callable"
     begin = time.time()
@@ skipping 879 matching lines @@
     if self._options.verbose:
       verbosity = 2
     result = unittest.TextTestRunner(verbosity=verbosity).run(pyauto_suite)
     del loaded_tests  # Need to destroy test cases before the suite
     del pyauto_suite
     sys.exit(not result.wasSuccessful())
 
 
 if __name__ == '__main__':
   Main()