Jack up timeouts for buildbots running android tests.

build/android/test_package.py

 #!/usr/bin/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 logging
 import re
 import os
 import pexpect
@@ skipping 30 matching lines @@
     self.test_suite_dirname = os.path.dirname(self.test_suite)
     self.rebaseline = rebaseline
     self.performance_test = performance_test
     self.cleanup_test_files = cleanup_test_files
     self.tool = CreateTool(tool, self.adb)
     if timeout == 0:
       if self.test_suite_basename == 'page_cycler_tests':
         timeout = 900
       else:
         timeout = 60
+    # On a VM (e.g. chromium buildbots), this timeout is way too small.
+    if os.environ.get('BUILDBOT_SLAVENAME'):

[michaelbai, 2011/11/21 23:05:53]

What's if the environment was not set in dev machine? Is there exception thrown?

[John Grabowski, 2011/11/21 23:07:13]

No; it returns None.  That's why I'm using get() instead of os.environ['FOO']

+      timeout = timeout * 2
     self.timeout = timeout * self.tool.GetTimeoutScale()
     self.dump_debug_info = dump_debug_info
 
   def _BeginGetIOStats(self):
     """Gets I/O statistics before running test.
 
     Return:
       Tuple of (I/O stats object, flag of ready to continue). When encountering
       error, ready-to-continue flag is False, True otherwise. The I/O stats
       object may be None if the test is not performance test.
@@ skipping 94 matching lines @@
     if not self.rebaseline and ready_to_continue:
       ok_tests += self._EndGetIOStats(io_stats_before)
       ret_code = self._GetGTestReturnCode()
       if ret_code:
         failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code,
                                         'pexpect.before: %s'
                                         '\npexpect.after: %s'
                                         % (p.before,
                                            p.after))]
     return TestResults.FromOkAndFailed(ok_tests, failed_tests)