Parametrize the keyboard test so that it can run in hwqual. Add to hwqual suite.

client/site_tests/hardware_KeyboardAssembly/src/KeyboardTest.py

 #!/usr/bin/python
 #
 # 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
 # keys function properly.  Run normally, this program will display a
@@ skipping 100 matching lines @@
     pass_msg_timeout = 2
 
     # Background color and alpha for the final result message.
     bg_rgba_error = (0.7,   0, 0, 0.9)
     bg_rgba_pass =  (  0, 0.7, 0, 0.9)
 
     # Highlight color and alpha to indicate activated keys.
     rgba_press_and_release = (  0, 0.5, 0, 0.6)
     rgba_press_only =        (0.6, 0.6, 0, 0.6)
 
-    def __init__(self, kbd_image):
+    def __init__(self, kbd_image, exit_on_error=False):
         self._kbd_image = kbd_image
+        self._exit_on_error = exit_on_error
         self._pressed_keys = set()
         self._successful_keys = set()
         self._deadline = None
         self._success = None
 
     def missing_keys(self):
         return set(KeyboardTest.bindings) - self._successful_keys
 
     def show_result(self, widget, context, text, bg_rgba):
         widget_width, widget_height = widget.get_size_request()
@@ skipping 33 matching lines @@
     def timer_event(self, window):
         if not self._deadline:
             # Ignore timer events with no countdown in progress.
             return True
         if self._deadline <= time.time():
             self._deadline = None
             if self._success is None:
                 self._success = False
                 mk = ['0x%x' % k for k in self.missing_keys()]
                 print 'missing_keys = %s' % ', '.join(mk)
+                if self._exit_on_error:
+                    sys.exit(1)
             elif self._success:
                 sys.exit(0)
         window.queue_draw()
         return True
 
     def expose_event(self, widget, event):
         context = widget.window.cairo_create()
 
         # Show keyboard image as the background.
         context.set_source_surface(self._kbd_image, 0, 0)
@@ skipping 189 matching lines @@
     drawing_area = gtk.DrawingArea()
     drawing_area.set_size_request(*kbd_image_size)
 
     if len(sys.argv) > 1 and sys.argv[1] == '--setup':
         kt = KeyboardTestSetup(kbd_image)
         window.set_default_size(981, 450)
         window.connect('key-press-event', kt.key_press_event)
         drawing_area.connect('button_release_event', kt.button_release_event)
         drawing_area.connect('button_press_event', kt.button_press_event)
     else:
-        kt = KeyboardTest(kbd_image)
+        exit_on_error = False
+        if '--exit-on-error' in sys.argv:
+            exit_on_error = True
+        kt = KeyboardTest(kbd_image, exit_on_error=exit_on_error)
         screen = window.get_screen()
         screen_size = (screen.get_width(), screen.get_height())
         window.set_default_size(*screen_size)
         window.connect('key-press-event', kt.key_press_event)
         window.connect('key-release-event', kt.key_release_event)
         gobject.timeout_add(1000, kt.timer_event, window)
 
     drawing_area.connect('expose_event', kt.expose_event)
 
     drawing_area.show()
 
     align = gtk.Alignment(xalign=0.5, yalign=0.5)
     align.add(drawing_area)
     align.show()
 
     drawing_area.set_events(gtk.gdk.EXPOSURE_MASK |
                             gtk.gdk.KEY_PRESS_MASK |
                             gtk.gdk.BUTTON_PRESS_MASK |
                             gtk.gdk.BUTTON_RELEASE_MASK)
 
     window.add(align)
     window.show()
 
     gtk.main()
 
     return (kt.success != True)
 
 if __name__ == '__main__':
     main()