Merge remote branch 'autotest-upstream/master' into autotest-merge

client/bin/site_job.py

 # Copyright (c) 2010 The Chromium OS 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 os
 from datetime import datetime
 from autotest_lib.client.bin import boottool, utils
 from autotest_lib.client.bin.job import base_client_job
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.cros import cros_logging
 
 
 LAST_BOOT_TAG = object()
 
 class site_job(base_client_job):
 
 
     def __init__(self, *args, **kwargs):
         base_client_job.__init__(self, *args, **kwargs)
 
 
-    def _runtest(self, url, tag, args, dargs):
+    def _runtest(self, url, timeout, tag, args, dargs):
         # this replaced base_client_job._runtest, which is called by
         # base_client_job.runtest.group_func (see job.py)
         try:
             self.last_error = None
-            base_client_job._runtest(self, url, tag, args, dargs)
+            base_client_job._runtest(self, url, timeout,tag, args, dargs)
         except error.TestBaseException, detail:
             self.last_error = detail
             raise
 
 
     def run_test(self, url, *args, **dargs):
         log_pauser = cros_logging.LogRotationPauser()
         passed = False
         try:
             log_pauser.begin()
@@ skipping 22 matching lines @@
 
         # sync first, so that a sync during shutdown doesn't time out
         utils.system("sync; sync", ignore_status=True)
 
         utils.system("(sleep 5; reboot) </dev/null >/dev/null 2>&1 &")
         self.quit()
 
 
     def require_gcc(self):
         return False