Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: client/site_tests/factory_LightSensor/factory_LightSensor.py

Issue 3226005: Refactory UI to grab shortcut keys, and tests to not look for triggers. (Closed) Base URL: http://git.chromium.org/git/autotest.git
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/site_tests/factory_Leds/factory_Leds.py ('k') | client/site_tests/factory_Review/factory_Review.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/site_tests/factory_LightSensor/factory_LightSensor.py
diff --git a/client/site_tests/factory_LightSensor/factory_LightSensor.py b/client/site_tests/factory_LightSensor/factory_LightSensor.py
index 0d84c6c81e827db979563f8d067fd947ac88308a..3c5123896844b3e597f01fa465630c4db9e45f5a 100644
--- a/client/site_tests/factory_LightSensor/factory_LightSensor.py
+++ b/client/site_tests/factory_LightSensor/factory_LightSensor.py
@@ -108,8 +108,6 @@ class factory_LightSensor(test.test):
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):
@@ -172,28 +170,23 @@ class factory_LightSensor(test.test):
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:
@@ -211,9 +204,7 @@ class factory_LightSensor(test.test):
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()
« no previous file with comments | « client/site_tests/factory_Leds/factory_Leds.py ('k') | client/site_tests/factory_Review/factory_Review.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698