Merge remote branch 'cros/upstream' into master

client/bin/job_unittest.py

 #!/usr/bin/python
 
 import logging, os, shutil, sys, time, StringIO
 import common
 
 from autotest_lib.client.bin import job, boottool, config, sysinfo, harness
 from autotest_lib.client.bin import test, xen, kernel, utils
 from autotest_lib.client.common_lib import packages, error, log
 from autotest_lib.client.common_lib import logging_manager, logging_config
 from autotest_lib.client.common_lib import base_job_unittest
 from autotest_lib.client.common_lib.test_utils import mock, unittest
 
 
 class job_test_case(unittest.TestCase):
     """Generic job TestCase class that defines a standard job setUp and
     tearDown, with some standard stubs."""
 
     job_class = job.base_client_job
 
     def setUp(self):
-        self.god = mock.mock_god()
+        self.god = mock.mock_god(ut=self)
         self.god.stub_with(job.base_client_job, '_get_environ_autodir',
                            classmethod(lambda cls: '/adir'))
         self.job = self.job_class.__new__(self.job_class)
         self.job._job_directory = base_job_unittest.stub_job_directory
 
 
     def tearDown(self):
         self.god.unstub_all()
 
 
@@ skipping 47 matching lines @@
         self.god.stub_function_to_return(job.boottool, 'boottool', object())
         class options:
             tag = ''
             verbose = False
             cont = False
             harness = 'stub'
             hostname = None
             user = None
             log = False
             args = ''
+            tap_report = None
         self.god.stub_function_to_return(job.utils, 'drop_caches', None)
 
         self.job._job_state = base_job_unittest.stub_job_state
         self.job.__init__('/control', options)
 
 
 class dummy(object):
     """A simple placeholder for attributes"""
     pass
 
 
 class first_line_comparator(mock.argument_comparator):
     def __init__(self, first_line):
         self.first_line = first_line
 
 
     def is_satisfied_by(self, parameter):
         return self.first_line == parameter.splitlines()[0]
 
 
 class test_base_job(unittest.TestCase):
     def setUp(self):
         # make god
-        self.god = mock.mock_god()
+        self.god = mock.mock_god(ut=self)
 
         # need to set some environ variables
         self.autodir = "autodir"
         os.environ['AUTODIR'] = self.autodir
 
         # set up some variables
         self.control = "control"
         self.jobtag = "jobtag"
 
         # get rid of stdout and logging
@@ skipping 111 matching lines @@
         # finish constructor
         options = dummy()
         options.tag = self.jobtag
         options.cont = cont
         options.harness = None
         options.log = False
         options.verbose = False
         options.hostname = 'localhost'
         options.user = 'my_user'
         options.args = ''
+        options.tap_report = None
         self.job.__init__(self.control, options,
                           extra_copy_cmdline=['more-blah'])
 
         # check
         self.god.check_playback()
 
 
     def get_partition_mock(self, devname):
         """
         Create a mock of a partition object and return it.
@@ skipping 19 matching lines @@
         self.job = job.base_client_job.__new__(job.base_client_job)
         options = dummy()
         options.tag = self.jobtag
         options.cont = False
         options.harness = None
         options.log = False
         options.verbose = False
         options.hostname = 'localhost'
         options.user = 'my_user'
         options.args = ''
+        options.tap_report = None
         error = Exception('fail')
 
         self.god.stub_function(self.job, '_post_record_init')
         self.god.stub_function(self.job, 'record')
 
         self._setup_pre_record_init(False)
         self.job._post_record_init.expect_call(
                 self.control, options, True, ['more-blah']).and_raises(error)
         self.job.record.expect_call(
                 'ABORT', None, None,'client.bin.job.__init__ failed: %s' %
@@ skipping 391 matching lines @@
 
         self.job._record_reboot_failure.expect_call("sub", "reboot.verify",
                 "boot failure", running_id="2.6.15-smp")
 
         # run test
         self.assertRaises(error.JobError, self.job.end_reboot_and_verify,
                           91234567, "2.6.16-smp", "sub")
         self.god.check_playback()
 
 
+    def test_parse_args(self):
+        test_set = {"a='foo bar baz' b='moo apt'":
+                    ["a='foo bar baz'", "b='moo apt'"],
+                    "a='foo bar baz' only=gah":
+                    ["a='foo bar baz'", "only=gah"],
+                    "a='b c d' no=argh":
+                    ["a='b c d'", "no=argh"]}
+        for t in test_set:
+            parsed_args = job.base_client_job._parse_args(t)
+            expected_args = test_set[t]
+            self.assertEqual(parsed_args, expected_args)
+
+
 if __name__ == "__main__":
     unittest.main()