[POS-commit] r3358 - in kiwi/trunk: .

[Johan Dahlin]

Author: jdahlin
Date: Thu Apr 27 15:32:21 2006
New Revision: 3358

Modified:
   kiwi/trunk/ChangeLog
   kiwi/trunk/kiwi/ui/test/main.py
   kiwi/trunk/kiwi/ui/test/player.py
   kiwi/trunk/kiwi/ui/test/recorder.py

Log:
    * kiwi/ui/test/main.py:
    * kiwi/ui/test/player.py:
    * kiwi/ui/test/recorder.py:
    Improve logging, fix a bug in finish()



Modified: kiwi/trunk/ChangeLog
==============================================================================
--- kiwi/trunk/ChangeLog	(original)
+++ kiwi/trunk/ChangeLog	Thu Apr 27 15:32:21 2006
@@ -1,5 +1,12 @@
 2006-04-27  Johan Dahlin  <jdahlin at async.com.br>
 
+	* kiwi/ui/test/main.py:
+	* kiwi/ui/test/player.py:
+	* kiwi/ui/test/recorder.py:
+	Improve logging, fix a bug in finish()
+
+2006-04-27  Johan Dahlin  <jdahlin at async.com.br>
+
 	* kiwi/ui/widgets/filechooser.py (ProxyFileChooserButton.__init__): 
 	Immitate PyGTK implementation argument wise
 

Modified: kiwi/trunk/kiwi/ui/test/main.py
==============================================================================
--- kiwi/trunk/kiwi/ui/test/main.py	(original)
+++ kiwi/trunk/kiwi/ui/test/main.py	Thu Apr 27 15:32:21 2006
@@ -26,27 +26,35 @@
 import optparse
 import sys
 
-def _play(filename, args):
+from kiwi.log import set_log_level
+
+def _play(options, filename, args):
     from kiwi.ui.test.player import play_file
     play_file(filename, args)
 
-def _record(filename, args):
+def _record(options, filename, args):
     from kiwi.ui.test.recorder import Recorder
 
-    Recorder(filename, args[1:])
+    Recorder(filename, args)
 
-    sys.argv = args[1:]
+    sys.argv = args
     execfile(sys.argv[0], globals(), globals())
 
 def main(args):
     parser = optparse.OptionParser()
     parser.add_option('', '--record', action="store",
                       dest="record")
+    parser.add_option('-v', '--verbose', action="store_true",
+                      dest="verbose")
     options, args = parser.parse_args(args)
 
     if options.record:
-        _record(options.record, args)
+        if options.verbose:
+            set_log_level('recorder', 5)
+        _record(options, options.record, args[1:])
     else:
         if len(args) < 2:
             raise SystemExit("Error: needs a filename to play")
-        _play(args[1], args[2:])
+        if options.verbose:
+            set_log_level('player', 5)
+        _play(options, args[1], args[2:])

Modified: kiwi/trunk/kiwi/ui/test/player.py
==============================================================================
--- kiwi/trunk/kiwi/ui/test/player.py	(original)
+++ kiwi/trunk/kiwi/ui/test/player.py	Thu Apr 27 15:32:21 2006
@@ -47,6 +47,10 @@
 # yada yada
 DELETE_WINDOW_WAIT = 4
 
+log = Logger('player')
+
+_mainloop = None
+
 class TimeOutError(Exception):
     """
     Exception that will be raised when a widget cannot be found,
@@ -55,8 +59,6 @@
     """
     pass
 
-log = Logger('uitest')
-
 class ThreadSafeFunction:
     """
     A function which is safe thread in the mainloop context
@@ -149,6 +151,7 @@
         gobject.idle_add(self._start_app, args)
 
     def _start_app(self, args):
+        log("Executing %s %s" % (args[0], args[1:]))
         sys.argv = args[:]
         execfile(sys.argv[0], globals(), globals())
 
@@ -218,7 +221,9 @@
             time.sleep(0.1)
 
     def finish(self):
-        pass
+        log("Player finished")
+        global _mainloop
+        _mainloop.quit()
 
 def play_file(filename, args=None):
     """
@@ -227,6 +232,7 @@
     @param filename: name to play
     @param args: additional arguments to put in sys.argv
     """
+
     if not os.path.exists(filename):
         raise SystemExit("%s: No such a file or directory" % filename)
 
@@ -244,7 +250,12 @@
             traceback.print_exception(etype, value, tb.tb_next)
             os._exit(1)
 
+    log("Starting script thread")
     t = threading.Thread(target=_thread, args=[filename])
     t.start()
 
-    gobject.MainLoop().run()
+    log("Entering main loop")
+    global _mainloop
+    _mainloop = gobject.MainLoop()
+    _mainloop.run()
+    log("Leaving main loop")

Modified: kiwi/trunk/kiwi/ui/test/recorder.py
==============================================================================
--- kiwi/trunk/kiwi/ui/test/recorder.py	(original)
+++ kiwi/trunk/kiwi/ui/test/recorder.py	Thu Apr 27 15:32:21 2006
@@ -39,12 +39,15 @@
 from gtk import gdk
 import gtk
 
+from kiwi.log import Logger
 from kiwi.ui.test.common import Base
 from kiwi.ui.combomixin import ComboMixin
 from kiwi.ui.objectlist import ObjectList
 
 _events = []
 
+log = Logger('recorder')
+
 def register_event_type(event_type):
     """
     Add an event type to a list of event types.
@@ -387,6 +390,7 @@
         return event_types
 
     def _add_event(self, event):
+        log("Added event %s" % event.serialize())
         self._events.append(event)
 
     def _listen_event(self, object, event_type):