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

client/site_tests/factory_ExtDisplay/factory_ExtDisplay.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.
 
 
 # DESCRIPTION :
 #
 # This is a factory test to test the external display (hdmi/vga/other)
 # UI based heavily on factory_Display/factory_Audio
 
@@ skipping 91 matching lines @@
             self._status_map[subtest_name] = ful.FAILED
             self.finish_subtest()
             self.goto_next_subtest()
         elif event.keyval == gtk.keysyms.Return and \
                 self._status_map[subtest_name] is ful.ACTIVE:
             self._status_map[subtest_name] = ful.PASSED
             self.finish_subtest()
             self.goto_next_subtest()
         elif event.keyval == ord('Q'):
             gtk.main_quit()
-        else:
-            self._ft_state.exit_on_trigger(event)
 
         # evaluating a new subtest now
         if subtest_name is not self._current_subtest[0]:
             subtest_name, subtest_cfg = self._current_subtest
             self.start_subtest()
             self._prompt_label.set_text(subtest_cfg['msg'])
 
         self._test_widget.queue_draw()
         return True
 
@@ skipping 30 matching lines @@
             raise error.TestFail('ERROR: Must provide an audio sample')
         if not os.path.isabs(sample):
             # assume its in deps
             sample = self.autodir + '/' + sample
         if not os.path.exists(sample):
             raise error.TestFail('ERROR: Unable to find audio sample %s' \
                                      % sample)
         self._sample=sample
 
     def run_once(self,
-                 test_widget_size=None,
-                 trigger_set=None,
                  has_audio=False,
-                 sample=None,
-                 ):
+                 sample=None):
 
         factory.log('%s run_once' % self.__class__)
-        # because audio files relative to that
+
+        # Src contains the audio files.
         os.chdir(self.autodir)
 
-        self._ft_state = ful.State(trigger_set=trigger_set)
-        self._test_widget_size = test_widget_size
         self._started = False
 
         if has_audio:
             self.locate_asample(sample)
             _SUBTEST_LIST.append(_OPTIONAL)
 
         self._subtest_queue = [x for x in reversed(_SUBTEST_LIST)]
         self._status_map = dict((n, ful.UNTESTED) for n, c in _SUBTEST_LIST)
 
 
         prompt_label = ful.make_label(_LABEL_START_STR, fg=ful.WHITE)
         self._prompt_label = prompt_label
 
         vbox = gtk.VBox()
         vbox.pack_start(prompt_label, False, False)
 
         for name, cfg in _SUBTEST_LIST:
             label_box = self.make_subtest_label_box(name)
             vbox.pack_start(label_box, False, False)
 
         self._test_widget = vbox
 
         self.goto_next_subtest()
         self.start_subtest()
 
-        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__)