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

client/site_tests/factory_LightSensor/factory_LightSensor.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 : factory test of ambient light sensor.  Test that ALS reacts to
 # both darkening by covering w/ finger as well as brightening.
 # Roughly speaking:
 # indoor ambient lighting: 20-100
@@ skipping 90 matching lines @@
             return self.buf[0]
         else:
             error.ValueError('Illegal value %s for type' % type)
 
 class factory_LightSensor(test.test):
     version = 1
 
     def key_release_callback(self, widget, event):
         if event.keyval == ord('Q'):
             gtk.main_quit()
-        else:
-            self._ft_state.exit_on_trigger(event)
         return True
 
     def timer_event(self, countdown_label):
         val = self._als.read('mean',samples=5, delay=0)
         #factory.log("avg_val = %d" % val)
 
         passed = 0
         for name in _SUBTEST_LIST:
             cfg = _SUBTEST_CFG[name]
             if 'max' in cfg:
@@ skipping 42 matching lines @@
         hbox.pack_end(label_sep, False, False)
         hbox.pack_end(label_en, False, False)
         eb.add(hbox)
         return eb
 
     def register_callbacks(self, window):
         window.connect('key-release-event', self.key_release_callback)
         window.add_events(gtk.gdk.KEY_RELEASE_MASK)
 
     def run_once(self,
-                 test_widget_size=None,
-                 trigger_set=None,
                  lux_min=None,
                  lux_max=None,
-                 timeout=60,
-                 ):
+                 timeout=60):
+
         factory.log('%s run_once' % self.__class__)
 
-        self._test_widget_size=test_widget_size
         self._als = tsl2563()
         self._deadline = time.time() + timeout
 
-        self._ft_state = ful.State(trigger_set=trigger_set)
-
         self._subtest_queue = [x for x in reversed(_SUBTEST_LIST)]
         self._status_map = dict((n, ful.ACTIVE) for n in _SUBTEST_LIST)
 
         vbox = gtk.VBox()
-        prompt_label = ful.make_label('Cover Sensor with Finger\n' + \
-                                          '请遮蔽光传感器\n\n' + \
-                                          'Shine flashlight at Sensor\n' + \
-                                          '请以灯光照射光传感器\n\n', fg=ful.WHITE)
+        prompt_label = ful.make_label(
+            'Cover Sensor with Finger\n' + '请遮蔽光传感器\n\n' +
+            'Shine flashlight at Sensor\n' + '请以灯光照射光传感器\n\n',
+            fg=ful.WHITE)
         vbox.pack_start(prompt_label, False, False)
 
         for name in _SUBTEST_LIST:
             label_box = self.make_subtest_label_box(name)
             vbox.pack_start(label_box, False, False)
             cfg = _SUBTEST_CFG[name]
             # change defaults per factory setup
             if 'max' in cfg and lux_max is not None:
                 cfg['max'] = lux_max
             if 'min' in cfg and lux_min is not None:
                 cfg['min'] = lux_min
 
         countdown_widget, countdown_label = ful.make_countdown_widget()
         vbox.pack_start(countdown_widget, False, False)
         gobject.timeout_add(200, self.timer_event, countdown_label)
 
         self._test_widget = vbox
-        self._ft_state.run_test_widget(
-            test_widget=vbox,
-            test_widget_size=test_widget_size,
+        ful.run_test_widget(self.job, vbox,
             window_registration_callback=self.register_callbacks)
 
         failed_set = set(name for name, status in self._status_map.items()
                          if status is not ful.PASSED)
         if failed_set:
             raise error.TestFail('some subtests failed (%s)' %
                                  ', '.join(failed_set))
 
         factory.log('%s run_once finished' % self.__class__)