Merge remote branch 'cros/upstream' into master

client/bin/setup_job_unittest.py

 #!/usr/bin/python
 
 import logging, os, shutil, sys, StringIO
 import common
 
 from autotest_lib.client.bin import job, setup_job
 from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import base_job, error, log, packages
 from autotest_lib.client.common_lib import logging_manager, logging_config
 from autotest_lib.client.common_lib import base_job_unittest
@@ skipping 61 matching lines @@
                                          'get_logging_manager', manager())
 
         class options:
             tag = ''
             verbose = False
             cont = False
             harness = 'stub'
             hostname = None
             user = None
             log = False
+            tap_report = None
 
         self.job.__init__(options)
 
 
 class dummy(object):
     """A simple placeholder for attributes"""
     pass
 
 
 class first_line_comparator(mock.argument_comparator):
@@ skipping 70 matching lines @@
 
         resultdir = self._setup_pre_record_init()
 
         # finish constructor
         options = dummy()
         options.tag = self.jobtag
         options.log = False
         options.verbose = False
         options.hostname = 'localhost'
         options.user = 'my_user'
+        options.tap_report = None
         self.job.__init__(options)
 
         # check
         self.god.check_playback()
 
 
     def get_partition_mock(self, devname):
         """
         Create a mock of a partition object and return it.
         """
@@ skipping 54 matching lines @@
         os.mkdir.expect_call(results_dir3)
 
         # test
         self.assertEqual(self.job.setup_dirs(None, tmp_dir),
                          (results_dir3, tmp_dir))
         self.god.check_playback()
 
 
 if __name__ == "__main__":
     unittest.main()