Relocate library files for wider access and re-use; also associated cleanup.

client/bin/factory_ui

Index: client/bin/factory_ui
diff --git a/client/deps/factory/ui b/client/bin/factory_ui
similarity index 79%
rename from client/deps/factory/ui
rename to client/bin/factory_ui
index b69684ae13f1f7f2a4de3d4c7b12d9e34b3ab2f3..30cdd8740ef7aeb09296812ec9ffdb16568ac984 100755
--- a/client/deps/factory/ui
+++ b/client/bin/factory_ui
@@ -25,32 +25,21 @@
 
 import gobject
 import gtk
+import imp
 import os
 import pango
 import subprocess
 import sys
 import time
 
+import common
+import factory
+import factory_ui_lib as ful
 
-def XXX_log(s):
-    print >> sys.stderr, 'FACTORY: ' + s
+from factory import TestData
 
-_ACTIVE = 'ACTIVE'
-_PASSED = 'PASS'
-_FAILED = 'FAIL'
-_UNTESTED = 'UNTESTED'
 
-_STATUS_CODE_MAP = {
-    'START': _ACTIVE,
-    'GOOD': _PASSED,
-    'FAIL': _FAILED,
-    'ERROR': _FAILED}
-
-_LABEL_COLORS = {
-    _ACTIVE: gtk.gdk.color_parse('light goldenrod'),
-    _PASSED: gtk.gdk.color_parse('pale green'),
-    _FAILED: gtk.gdk.color_parse('tomato'),
-    _UNTESTED: gtk.gdk.color_parse('dark slate grey')}
+_SEP_COLOR = gtk.gdk.color_parse('grey50')
 
 _LABEL_EN_SIZE = (160, 35)
 _LABEL_EN_FONT = pango.FontDescription('courier new extra-condensed 16')
@@ -63,26 +52,24 @@ _LABEL_TROUGH_COLOR = gtk.gdk.color_parse('grey20')
 _LABEL_STATUS_SIZE = (140, 30)
 _LABEL_STATUS_FONT = pango.FontDescription(
     'courier new bold extra-condensed 16')
-_SEP_COLOR = gtk.gdk.color_parse('grey50')
-_BLACK = gtk.gdk.color_parse('black')
-_LIGHT_GREEN = gtk.gdk.color_parse('light green')
 _OTHER_LABEL_FONT = pango.FontDescription('courier new condensed 20')
 
-class console_proc:
+
+class Console:
     '''Display a progress log.  Implemented by launching an borderless
     xterm at a strategic location, and running tail against the log.'''
 
-    def __init__(self, allocation, log_file_path):
+    def __init__(self, allocation):
         xterm_coords = '135x14+%d+%d' % (allocation.x, allocation.y)
-        XXX_log('xterm_coords = %s' % xterm_coords)
+        factory.log('xterm_coords = %s' % xterm_coords)
         xterm_cmd = (('aterm --geometry %s -bw 0 -e bash -c ' %
                       xterm_coords).split() +
-                     ['tail -f %s | grep FACTORY' % log_file_path])
-        XXX_log('xterm_cmd = %s' % xterm_cmd)
+                     ['tail -f %s | grep FACTORY' % factory.LOG_PATH])
+        factory.log('xterm_cmd = %s' % xterm_cmd)
         self._proc = subprocess.Popen(xterm_cmd)
 
     def __del__(self):
-        XXX_log('console_proc __del__')
+        factory.log('console_proc __del__')
         self._proc.kill()
 
 
@@ -91,7 +78,7 @@ class console_proc:
 # messages.
 
 def stdin_callback(s, c):
-    XXX_log('stdin_callback, quitting gtk main')
+    factory.log('stdin_callback, quitting gtk main')
     gtk.main_quit()
     return True
 
@@ -103,7 +90,7 @@ def control_send(x):
     sys.stdout.flush()
 
 def control_send_target_test_update(test, count):
-    XXX_log('ui send_target_test_update %s.%s_%s' %
+    factory.log('ui send_target_test_update %s.%s_%s' %
             (test.formal_name, test.tag_prefix, count))
     control_send((test.formal_name, test.tag_prefix, count))
 
@@ -113,7 +100,7 @@ def control_send_target_test_update(test, count):
 # tests, and hence this should not be called.
 
 def handle_key_release_event(_, event):
-    XXX_log('base ui key event (%s)' % event.keyval)
+    factory.log('base ui key event (%s)' % event.keyval)
     return True
 
 
@@ -121,7 +108,7 @@ class TestLabelBox(gtk.EventBox):
 
     def __init__(self, test):
         gtk.EventBox.__init__(self)
-        self.modify_bg(gtk.STATE_NORMAL, _LABEL_COLORS[_UNTESTED])
+        self.modify_bg(gtk.STATE_NORMAL, ft.LABEL_COLORS[ft.UNTESTED])
         label_en = gtk.Label(test.label_en)
         label_en.set_size_request(*_LABEL_EN_SIZE)
         label_en.modify_font(_LABEL_EN_FONT)
@@ -136,7 +123,7 @@ class TestLabelBox(gtk.EventBox):
         label_t.set_size_request(*_LABEL_T_SIZE)
         label_t.modify_font(_LABEL_T_FONT)
         label_t.set_alignment(0.5, 0.5)
-        label_t.modify_fg(gtk.STATE_NORMAL, _BLACK)
+        label_t.modify_fg(gtk.STATE_NORMAL, ft.BLACK)
         hbox = gtk.HBox()
         hbox.pack_start(label_en, False, False)
         hbox.pack_start(label_zw, False, False)
@@ -145,12 +132,12 @@ class TestLabelBox(gtk.EventBox):
         self.label_list = [label_en, label_zw]
 
     def update(self, status):
-        if status == _UNTESTED:
+        if status == ft.UNTESTED:
             return
-        self.modify_fg(gtk.STATE_NORMAL, _BLACK)
+        self.modify_fg(gtk.STATE_NORMAL, ft.BLACK)
         for label in self.label_list:
-            label.modify_fg(gtk.STATE_NORMAL, _BLACK)
-        self.modify_bg(gtk.STATE_NORMAL, _LABEL_COLORS[status])
+            label.modify_fg(gtk.STATE_NORMAL, ft.BLACK)
+        self.modify_bg(gtk.STATE_NORMAL, ft.LABEL_COLORS[status])
         self.queue_draw()
 
 
@@ -158,8 +145,8 @@ class SubTestLabelBox(gtk.EventBox):
 
     def __init__(self, test):
         gtk.EventBox.__init__(self)
-        self.modify_bg(gtk.STATE_NORMAL, _BLACK)
-        label_status = gtk.Label(_UNTESTED)
+        self.modify_bg(gtk.STATE_NORMAL, ft.BLACK)
+        label_status = gtk.Label(ft.UNTESTED)
         label_status.set_size_request(*_LABEL_STATUS_SIZE)
         label_status.set_alignment(0, 0.5)
         label_status.modify_font(_LABEL_STATUS_FONT)
@@ -167,15 +154,15 @@ class SubTestLabelBox(gtk.EventBox):
         label_en = gtk.Label(test.label_en)
         label_en.set_alignment(1, 0.5)
         label_en.modify_font(_LABEL_EN_FONT)
-        label_en.modify_fg(gtk.STATE_NORMAL, _LIGHT_GREEN)
+        label_en.modify_fg(gtk.STATE_NORMAL, ft.LIGHT_GREEN)
         label_zw = gtk.Label(test.label_zw)
         label_zw.set_alignment(1, 0.5)
         label_zw.modify_font(_LABEL_ZW_FONT)
-        label_zw.modify_fg(gtk.STATE_NORMAL, _LIGHT_GREEN)
+        label_zw.modify_fg(gtk.STATE_NORMAL, ft.LIGHT_GREEN)
         label_sep = gtk.Label(' : ')
         label_sep.set_alignment(0.5, 0.5)
         label_sep.modify_font(_LABEL_EN_FONT)
-        label_sep.modify_fg(gtk.STATE_NORMAL, _LIGHT_GREEN)
+        label_sep.modify_fg(gtk.STATE_NORMAL, ft.LIGHT_GREEN)
         hbox = gtk.HBox()
         hbox.pack_end(label_status, False, False)
         hbox.pack_end(label_sep, False, False)
@@ -185,10 +172,10 @@ class SubTestLabelBox(gtk.EventBox):
         self.label_status = label_status
 
     def update(self, status):
-        if status == _UNTESTED:
+        if status == ft.UNTESTED:
             return
         self.label_status.set_text(status)
-        self.label_status.modify_fg(gtk.STATE_NORMAL, _LABEL_COLORS[status])
+        self.label_status.modify_fg(gtk.STATE_NORMAL, ft.LABEL_COLORS[status])
         self.queue_draw()
 
 
@@ -200,10 +187,10 @@ class StatusMap():
         self._status_dict = {}
         for test in test_list:
             test_index = self.index(test.formal_name, test.tag_prefix)
-            self._status_dict[test_index] = (test, _UNTESTED, 0, None)
+            self._status_dict[test_index] = (test, ft.UNTESTED, 0, None)
             for subtest in test.automated_seq:
                 st_index = self.index(subtest.formal_name, subtest.tag_prefix)
-                self._status_dict[st_index] = (subtest, _UNTESTED, 0, None)
+                self._status_dict[st_index] = (subtest, ft.UNTESTED, 0, None)
         self._status_file_path = status_file_path
         self._status_file_pos = 0
         self.read_new_data()
@@ -214,8 +201,8 @@ class StatusMap():
 
     def next_untested(self):
         remaining = [t for t in self._test_queue
-                     if self.lookup_status(t) == _UNTESTED]
-        XXX_log('remaining untested = [%s]' %
+                     if self.lookup_status(t) == ft.UNTESTED]
+        factory.log('remaining untested = [%s]' %
                 ', '.join([self.index(t.formal_name, t.tag_prefix)
                            for t in remaining]))
         if not remaining: return None
@@ -228,10 +215,10 @@ class StatusMap():
                 cols = line.lstrip().split('\t') + ['']
                 code = cols[0]
                 test_id = cols[1]
-                if code not in _STATUS_CODE_MAP or test_id == '----':
+                if code not in ft.STATUS_CODE_MAP or test_id == '----':
                     continue
-                status = _STATUS_CODE_MAP[code]
-                XXX_log('reading code = %s, test_id = %s' % (code, test_id))
+                status = ft.STATUS_CODE_MAP[code]
+                factory.log('reading code = %s, test_id = %s' % (code, test_id))
                 formal_name, _, tag = test_id.rpartition('.')
                 tag_prefix, _, count = tag.rpartition('_')
                 self.update(formal_name, tag_prefix, status, int(count))
@@ -242,15 +229,15 @@ class StatusMap():
     def update(self, formal_name, tag_prefix, status, count):
         test_index = self.index(formal_name, tag_prefix)
         if test_index not in self._status_dict:
-            XXX_log('ignoring status update (%s) for test %s' %
+            factory.log('ignoring status update (%s) for test %s' %
                     (status, test_index))
             return
         test, old_status, old_count, label = self._status_dict[test_index]
         if count < old_count:
-            XXX_log('ERROR: count regression for %s (%d-%d)' %
+            factory.log('ERROR: count regression for %s (%d-%d)' %
                     (test_index, old_count, count))
         if status != old_status:
-            XXX_log('status change for %s : %s/%s -> %s/%s' %
+            factory.log('status change for %s : %s/%s -> %s/%s' %
                     (test_index, old_status, old_count, status, count))
             if label is not None:
                 label.update(status)
@@ -261,10 +248,8 @@ class StatusMap():
         max_count = max(map(self.lookup_count, test.automated_seq))
         if len(st_status_set) == 1:
             status = st_status_set.pop()
-        elif _ACTIVE in st_status_set:
-            status = _ACTIVE
         else:
-            status = _FAILED
+            status = ft.ACTIVE in st_status_set and ft.ACTIVE or ft.FAILED
         self.update(test.formal_name, test.tag_prefix, status, max_count)
 
     def set_label(self, test, label):
@@ -304,9 +289,9 @@ def make_notest_label():
     label = gtk.Label('no active test')
     label.modify_font(_OTHER_LABEL_FONT)
     label.set_alignment(0.5, 0.5)
-    label.modify_fg(gtk.STATE_NORMAL, _LIGHT_GREEN)
+    label.modify_fg(gtk.STATE_NORMAL, ft.LIGHT_GREEN)
     box = gtk.EventBox()
-    box.modify_bg(gtk.STATE_NORMAL, _BLACK)
+    box.modify_bg(gtk.STATE_NORMAL, ft.BLACK)
     box.add(label)
     return box
 
@@ -322,7 +307,7 @@ def make_automated_seq_widget(as_test, status_map):
 def main():
     window = gtk.Window(gtk.WINDOW_TOPLEVEL)
     window.connect('destroy', lambda _: gtk.main_quit())
-    window.modify_bg(gtk.STATE_NORMAL, _BLACK)
+    window.modify_bg(gtk.STATE_NORMAL, ft.BLACK)
 
     screen = window.get_screen()
     screen_size = (screen.get_width(), screen.get_height())
@@ -337,7 +322,7 @@ def main():
 
     console_box = gtk.EventBox()
     console_box.set_size_request(-1, 180)
-    console_box.modify_bg(gtk.STATE_NORMAL, _BLACK)
+    console_box.modify_bg(gtk.STATE_NORMAL, ft.BLACK)
 
     notest_label = make_notest_label()
 
@@ -361,10 +346,9 @@ def main():
     # On startup, get general configuration data from the autotest
     # control program, specifically the list of tests to run (in
     # order) and some filenames.
-    XXX_log('pulling control info')
+    factory.log('pulling control info')
     test_list = control_recv()
     status_file_path = control_recv()
-    log_file_path = control_recv()
 
     status_map = StatusMap(status_file_path, test_list)
 
@@ -383,16 +367,16 @@ def main():
     test_widget_allocation = test_widget_box.get_allocation()
     test_widget_size = (test_widget_allocation.width,
                         test_widget_allocation.height)
-    XXX_log('test_widget_size = %s' % repr(test_widget_size))
+    factory.log('test_widget_size = %s' % repr(test_widget_size))
     control_send(test_widget_size)
 
     trigger_dict = dict((test.trigger, test) for test in test_list)
 
     gobject.io_add_watch(sys.stdin, gobject.IO_IN, stdin_callback)
 
-    console = console_proc(console_box.get_allocation(), log_file_path)
+    console = Console(console_box.get_allocation())
 
-    XXX_log('finished ui setup')
+    factory.log('finished ui setup')
 
     # Test selection is driven either by triggers or by the
     # remaining_tests_queue.  If a trigger was seen, explicitly run
@@ -408,43 +392,36 @@ def main():
 
     while True:
         command, arg = control_recv()
-        XXX_log('ui received command %s(%s)' % (command, arg))
+        factory.log('ui received command %s(%s)' % (command, arg))
         if command == 'switch_to':
             next_test = trigger_dict.get(arg, None)
         elif command == 'next_test':
             next_test = status_map.next_untested()
         else:
-            XXX_log('ui command unknown, exiting...')
+            factory.log('ui command unknown, exiting...')
             break
         control_send_target_test_update(
             next_test, status_map.lookup_count(next_test) + 1)
         if next_test.automated_seq:
-            XXX_log('ui starting automated_seq')
+            factory.log('ui starting automated_seq')
             test_widget_box.remove(notest_label)
             as_widget = make_automated_seq_widget(next_test, status_map)
             test_widget_box.add(as_widget)
             window.show_all()
             gtk.main()
             command = control_recv()
-            XXX_log('ui automated_seq cmd (%s)' % command)
+            factory.log('ui automated_seq cmd (%s)' % command)
             test_widget_box.remove(as_widget)
             test_widget_box.add(notest_label)
             window.show_all()
-            XXX_log('ui exiting automated_seq')
+            factory.log('ui exiting automated_seq')
         else:
             gtk.main()
 
     # Tell the control process we are done.
     control_send((None, 0))
 
-    XXX_log('exiting ui')
+    factory.log('exiting ui')
 
 if __name__ == '__main__':
-
-    # In global scope, get the test_data class description from the
-    # control program -- this allows a convenient single point of
-    # definition for this class.
-    test_data_class_def = control_recv()
-    exec(test_data_class_def)
-
     main()