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

client/common_lib/base_job.py

 import os, copy, logging, errno, fcntl, time, re, weakref, traceback
 import tarfile
 import cPickle as pickle
 from autotest_lib.client.common_lib import autotemp, error, log
 
 
 class job_directory(object):
     """Represents a job.*dir directory."""
 
 
@@ skipping 451 matching lines @@
         self.message = message_lines[0].replace('\t', ' ' * 8)
         self.extra_message_lines = message_lines[1:]
         if self.BAD_CHAR_REGEX.search(self.message):
             raise ValueError('Invalid character in message %r' % self.message)
 
         if not fields:
             self.fields = {}
         else:
             self.fields = fields.copy()
         for key, value in self.fields.iteritems():
+            if type(value) is int:
+                value = str(value)
             if self.BAD_CHAR_REGEX.search(key + value):
                 raise ValueError('Invalid character in %r=%r field'
                                  % (key, value))
 
         # build up the timestamp
         if timestamp is None:
             timestamp = int(time.time())
         self.fields[self.TIMESTAMP_FIELD] = str(timestamp)
         self.fields[self.LOCALTIME_FIELD] = time.strftime(
             '%b %d %H:%M:%S', time.localtime(timestamp))
@@ skipping 715 matching lines @@
         """Record a job-level status event, using a status_log_entry.
 
         This is the same as self.record but using an existing status log
         entry object rather than constructing one for you.
 
         @param entry: A status_log_entry object
         @param log_in_subdir: A boolean that indicates (when true) that subdir
                 logs should be written into the subdirectory status log file.
         """
         self._get_status_logger().record_entry(entry, log_in_subdir)