Use keyboard_layout instead of initial_locale

client/site_tests/factory_Keyboard/factory_Keyboard.py

 # -*- coding: utf-8 -*-
 #
 # 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.
 
 
 # DESCRIPTION :
 #
 # Intended for use during manufacturing to validate that all keyboard
@@ skipping 112 matching lines @@
         window.connect('key-press-event', self.key_press_event)
         window.connect('key-release-event', self.key_release_event)
         window.add_events(gdk.KEY_PRESS_MASK | gdk.KEY_RELEASE_MASK)
 
 
 class factory_Keyboard(test.test):
     version = 1
     preserve_srcdir = True
 
     def get_layout_from_vpd(self):
-       """ vpd should contain "initial_locale"="en-US" or similar. """
+       """ vpd should contain
+          "initial_locale"="en-US"
+          "keyboard_layout"="xkb:us::eng"
+       or similar. """
        cmd = 'vpd -l | grep initial_locale | cut -f4 -d\'"\''
        layout = utils.system_output(cmd).strip()
        if layout != '':
            return layout
        return None
 
     def run_once(self, layout=None):
 
         factory.log('%s run_once' % self.__class__)
 
@@ skipping 37 matching lines @@
         test_widget.pack_start(countdown_widget, False, False)
 
         ful.run_test_widget(self.job, test_widget,
             window_registration_callback=test.register_callbacks)
 
         missing = test.calc_missing_string()
         if missing:
             raise error.TestFail(missing)
 
         factory.log('%s run_once finished' % self.__class__)