Refactory UI to grab shortcut keys, and tests to not look for triggers.

client/site_tests/factory_Camera/factory_Camera.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 :
 #
 # This test looks in "/dev/video0" for a v4l2 video capture device,
@@ skipping 88 matching lines @@
                     self.ledfail = True
                 self.ledstats >>= 1
             if self.stage == self.led_rounds:
                 self.fail = False
                 gtk.main_quit()
             self.stage += 1
             if self.ledstats & 1:
                 self.dev.capture_mmap_start()
             self.label.hide()
             glib.timeout_add(1000, lambda *x: self.label.show())
-
-        self.ft_state.exit_on_trigger(event)
-        return
+        return True
 
     def register_callbacks(self, w):
         w.connect('key-release-event', self.key_release_callback)
         w.add_events(gdk.KEY_RELEASE_MASK)
 
-    def run_once(self, test_widget_size=None, trigger_set=None, led_rounds=5):
+    def run_once(self,
+                 led_rounds=5):
         '''Run the camera test
 
         Parameter
           led_rounds: 0 to disable the LED test,
                       1 to check if the LED turns on,
                       2 or higher to have multiple random turn on/off
                       (at least one on round and one off round is guranteed)
         '''
         factory.log('%s run_once' % self.__class__)
 
         self.fail = True
         self.ledfail = False
         self.led_rounds = led_rounds
         self.ledstats = 0
         if led_rounds == 1:
             # always on if only one round
             self.ledstats = 1
         elif led_rounds > 1:
             # ensure one on round and one off round
             self.ledstats = randrange(2 ** led_rounds - 2) + 1
         self.stage = 0
 
-        self.ft_state = ful.State(trigger_set)
-
         self.label = label = gtk.Label(MESSAGE_STR)
         label.modify_font(LABEL_FONT)
         label.modify_fg(gtk.STATE_NORMAL, gdk.color_parse('light green'))
 
         test_widget = gtk.VBox()
         test_widget.modify_bg(gtk.STATE_NORMAL, gdk.color_parse('black'))
         test_widget.add(label)
         self.test_widget = test_widget
 
         self.img = None
@@ skipping 19 matching lines @@
         self.pixbuf = gdk.Pixbuf(gdk.COLORSPACE_RGB, False, 8,
             width, height)
         self.pixels = self.pixbuf.get_pixels_array()
         self.img = gtk.image_new_from_pixbuf(self.pixbuf)
         self.test_widget.add(self.img)
         self.img.show()
 
         dev.capture_mmap_prepare(PREFERRED_BUFFER_COUNT, 2)
         dev.capture_mmap_start()
 
-        self.ft_state.run_test_widget(
-            test_widget=test_widget,
-            test_widget_size=test_widget_size,
+        ful.run_test_widget(self.job, test_widget,
             window_registration_callback=self.register_callbacks)
 
         # we don't call capture_mmap_stop here,
         # it will be called before returning from main loop.
         dev.capture_mmap_finish()
 
         if self.fail:
             raise error.TestFail('Camera test failed by user indication\n' \
                                  '品管人員懷疑攝影鏡頭故障，請檢修')
         if self.ledfail:
             raise error.TestFail('Camera LED test failed\n' \
                                  '攝影鏡頭 LED 測試不通過，請檢修')
 
         factory.log('%s run_once finished' % self.__class__)