r17883 - /trunk/test_suite/test_suite_runner.py -- October 17, 2012 - 10:53

Author: bugman
Date: Wed Oct 17 10:53:40 2012
New Revision: 17883

URL: http://svn.gna.org/viewcvs/relax?rev=17883&view=rev
Log:
Import fix for the relax GUI tests for a problem only recently introduced.


Modified:
    trunk/test_suite/test_suite_runner.py

Modified: trunk/test_suite/test_suite_runner.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/test_suite_runner.py?rev=17883&r1=17882&r2=17883&view=diff
==============================================================================
--- trunk/test_suite/test_suite_runner.py (original)
+++ trunk/test_suite/test_suite_runner.py Wed Oct 17 10:53:40 2012
@@ -39,7 +39,8 @@
 
 # relax module imports.
 if dep_check.wx_module:
-    import gui
+    from gui import relax_gui
+    from gui import interpreter
 from test_suite.relax_test_runner import GuiTestRunner, RelaxTestRunner
 from status import Status; status = Status()
 
@@ -120,7 +121,7 @@
                 app = wx.App(redirect=False)
 
                 # Build the GUI.
-                app.gui = gui.relax_gui.Main(parent=None, id=-1, title="")
+                app.gui = relax_gui.Main(parent=None, id=-1, title="")
 
             # Execute the GUI tests.
             gui_runner = GUI_test_runner()
@@ -129,8 +130,8 @@
             # Clean up for the GUI, if not in GUI mode.
             if status.test_mode:
                 # Terminate the interpreter thread to allow the tests to 
cleanly exit.
-                interpreter = gui.interpreter.Interpreter()
-                interpreter.exit()
+                interpreter_thread = interpreter.Interpreter()
+                interpreter_thread.exit()
 
                 # Stop the GUI main loop.
                 app.ExitMainLoop()