Merge remote branch 'cros/upstream' into master

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):
@@ skipping 407 matching lines @@
                                                           self.build_dir)
 
         # run and check
         self.kernel.get_kernel_tree(self.base_tree)
         self.god.check_playback()
 
 
     def test_extraversion(self):
         self.construct_kernel()
         tag = "tag"
+        # setup
+        self.god.stub_function(self.kernel, "config")
 
         # record
         os.chdir.expect_call(self.build_dir)
-        extraversion_sub = r's/^EXTRAVERSION =\s*\(.*\)/EXTRAVERSION = '
-        p = extraversion_sub + '\\1-%s/' % tag
-        utils.system.expect_call('mv Makefile Makefile.old')
-        utils.system.expect_call('sed "%s" < Makefile.old > Makefile' % p)
+        extraversion_sub = r's/^CONFIG_LOCALVERSION=\s*"\(.*\)"/CONFIG_LOCALVERSION='
+        cfg = self.build_dir + '/.config'
+        p = extraversion_sub + '"\\1-%s"/' % tag
+        utils.system.expect_call('mv %s %s.old' % (cfg, cfg))
+        utils.system.expect_call("sed '%s' < %s.old > %s" % (p, cfg, cfg))
+        self.kernel.config.expect_call(make='oldconfig')
 
         # run and check
         self.kernel.extraversion(tag)
         self.god.check_playback()
 
 
     def test_build(self):
         self.construct_kernel()
         self.god.stub_function(self.kernel, "extraversion")
         self.god.stub_function(self.kernel, "set_cross_cc")
@@ skipping 194 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()