Use keyboard_layout instead of initial_locale

client/site_tests/hardware_Components/hardware_Components.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import firmware_hash
 import glob
 import logging
 import os
 import pprint
 import re
@@ skipping 251 matching lines @@
     def get_part_id_hwqual(self):
         hwid_file = '/sys/devices/platform/chromeos_acpi/HWID'
         if os.path.exists(hwid_file):
             part_id = utils.read_one_line(hwid_file)
             return part_id
         else:
             return self._not_present
 
     def get_part_id_keyboard(self):
         # VPD value "initial_locale"="en-US" should be listed.
-        cmd = 'vpd -l | grep initial_locale | cut -f4 -d\'"\' '
+        cmd = 'vpd -i RO_VPD -l | grep \"keyboard_layout\" | cut -f4 -d\'"\' '
         part_id = utils.system_output(cmd).strip()
         if part_id != '':
             return part_id
         else:
             return self._not_present
 
     def get_part_id_storage(self):
         cmd = ('cd $(find /sys/devices -name sda)/../..; '
                'cat vendor model | tr "\n" " " | sed "s/ \+/ /g"')
         part_id = utils.system_output(cmd).strip()
@@ skipping 269 matching lines @@
                     # hardware_Components may run without factory environment
                     factory.log('Failed setting shared data, ignored: %s' %
                                 repr(e))
                 return
 
         if only_cardreader_failed:
             all_failures = ('You may forget to insert an SD card.\n' +
                             all_failures)
 
         raise error.TestFail(all_failures)