Merge remote branch 'cros/upstream' into tempbranch

client/bin/kernel_unittest.py

 #!/usr/bin/python
 
 import unittest, os, time, re, glob, logging
 import common
 from autotest_lib.client.common_lib.test_utils import mock
 from autotest_lib.client.bin import kernel, job, utils, kernelexpand
 from autotest_lib.client.bin import kernel_config, boottool, os_dep
 
 
 class TestAddKernelToBootLoader(unittest.TestCase):
 
     def add_to_bootloader(self, base_args, args, bootloader_args,
                           bootloader_root, tag='image', image='image',
                           initrd='initrd'):
         god = mock.mock_god()
         bootloader = god.create_mock_class(boottool.boottool, "boottool")
 
         # record
         bootloader.remove_kernel.expect_call(tag)
         bootloader.add_kernel.expect_call(image, tag, initrd=initrd,
-                                          args=bootloader_args,
-                                          root=bootloader_root)
+                                          args='_dummy_', root=bootloader_root)
+
+        for a in bootloader_args.split():
+            bootloader.add_args.expect_call(kernel=tag, args=a)
+        bootloader.remove_args.expect_call(kernel=tag, args='_dummy_')
 
         # run and check
         kernel._add_kernel_to_bootloader(bootloader, base_args, tag, args,
                                          image, initrd)
         god.check_playback()
 
 
     def test_add_kernel_to_bootloader(self):
         self.add_to_bootloader(base_args='baseargs', args='',
                                bootloader_args='baseargs', bootloader_root=None)
@@ skipping 435 matching lines @@
 
 
     def test_build_timed(self):
         self.construct_kernel()
         self.god.stub_function(self.kernel, "set_cross_cc")
         self.god.stub_function(self.kernel, "clean")
 
         # record
         os.chdir.expect_call(self.build_dir)
         self.kernel.set_cross_cc.expect_call()
-        self.kernel.clean.expect_call(logged=False)
+        self.kernel.clean.expect_call()
         build_string = "/usr/bin/time -o /dev/null make  -j 8 vmlinux"
         build_string += ' > /dev/null 2>&1'
         utils.system.expect_call(build_string)
         os.path.isfile.expect_call('vmlinux').and_return(True)
 
         # run and check
         self.kernel.build_timed(threads=8)
         self.god.check_playback()
 
 
@@ skipping 13 matching lines @@
     def test_mkinitrd(self):
         self.construct_kernel()
 
         # record
         utils.get_os_vendor.expect_call().and_return('Ubuntu')
         os.path.isfile.expect_call('initrd').and_return(True)
         os.remove.expect_call('initrd')
         self.job.config_get.expect_call(
             'kernel.mkinitrd_extra_args').and_return(None)
         args = ''
+        glob.glob.expect_call('/lib/modules/2.6.24*').and_return(['2.6.24'])
         os.path.isfile.expect_call('/usr/sbin/mkinitrd').and_return(True)
         cmd = '/usr/sbin/mkinitrd'
         utils.system.expect_call('%s %s -o initrd 2.6.24' % (cmd, args))
         self.job.record.expect_call('GOOD', self.subdir, 'kernel.mkinitrd')
 
         # run and check
         self.kernel.mkinitrd(version="2.6.24", image="image",
                              system_map="system_map", initrd="initrd")
         self.god.check_playback()
 
@@ skipping 113 matching lines @@
                 args, ident, expected_ident,
                 self.subdir, self.kernel.applied_patches)
 
         # run and check
         self.kernel.boot(args=args, ident=ident)
         self.god.check_playback()
 
 
 if __name__ == "__main__":
     unittest.main()