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

client/bin/site_job.py

Index: client/bin/site_job.py
diff --git a/client/bin/site_job.py b/client/bin/site_job.py
index 461ede580417c679bfd3ef4eb9f905b4493bbfae..cb954a5e186468c27136c2cc5d9c67aef6c137ec 100755
--- a/client/bin/site_job.py
+++ b/client/bin/site_job.py
@@ -19,12 +19,12 @@ class site_job(base_client_job):
         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