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

Unified Diff: client/site_tests/factory_Camera/factory_Camera.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
Index: client/site_tests/factory_Camera/factory_Camera.py
diff --git a/client/site_tests/factory_Camera/factory_Camera.py b/client/site_tests/factory_Camera/factory_Camera.py
index c3ab1cfb9394d3a9f05b6893a30686e500f658e2..18678af86982127e49f1fda5bd4f5979062dbf7a 100644
--- a/client/site_tests/factory_Camera/factory_Camera.py
+++ b/client/site_tests/factory_Camera/factory_Camera.py
@@ -106,15 +106,14 @@ class factory_Camera(test.test):
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
@@ -137,8 +136,6 @@ class factory_Camera(test.test):
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'))
@@ -178,9 +175,7 @@ class factory_Camera(test.test):
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,

Powered by Google App Engine
This is Rietveld 408576698