Merge remote branch 'cros/upstream' into master.

server/crashcollect.py

 import os, time, pickle, logging, shutil
 
 from autotest_lib.server import utils
 
 
 # import any site hooks for the crashdump and crashinfo collection
 get_site_crashdumps = utils.import_site_function(
     __file__, "autotest_lib.server.site_crashcollect", "get_site_crashdumps",
     lambda host, test_start_time: None)
 get_site_crashinfo = utils.import_site_function(
@@ skipping 28 matching lines @@
     @param host: A RemoteHost instance to wait on
     @param hours_to_wait: Number of hours to wait before giving up
 
     @returns: True if the machine comes back up, False otherwise
     """
     current_time = time.strftime("%b %d %H:%M:%S", time.localtime())
     if host.is_up():
         logging.info("%s already up, collecting crash info", host.hostname)
         return True
 
-    logging.info("Waiting four hours for %s to come up (%s)",
-                 host.hostname, current_time)
+    logging.info("Waiting %s hours for %s to come up (%s)",
+                 hours_to_wait, host.hostname, current_time)
     if not host.wait_up(timeout=hours_to_wait * 3600):
         logging.warning("%s down, unable to collect crash info",
                         host.hostname)
         return False
     else:
         logging.info("%s is back up, collecting crash info", host.hostname)
         return True
 
 
 def get_crashinfo_dir(host):
@@ skipping 117 matching lines @@
         shutil.copyfileobj(raw_messages_file, messages_file)
         raw_messages_file.close()
         messages_file.close()
 
         # get rid of the "raw" versions of messages
         os.remove(messages_raw)
         if os.path.exists(messages_at_start):
             os.remove(messages_at_start)
     except Exception, e:
         logging.warning("Error while collecting /var/log/messages: %s", e)