r17819 - /trunk/test_suite/test_suite_runner.py -- October 15, 2012 - 18:36

Author: bugman
Date: Mon Oct 15 18:36:40 2012
New Revision: 17819

URL: http://svn.gna.org/viewcvs/relax?rev=17819&view=rev
Log:
The test suite can now run again when wxPython is missing (bug from the last 
commit).


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=17819&r1=17818&r2=17819&view=diff
==============================================================================
--- trunk/test_suite/test_suite_runner.py (original)
+++ trunk/test_suite/test_suite_runner.py Mon Oct 15 18:36:40 2012
@@ -19,13 +19,14 @@
 #                                                                            
 #
 
###############################################################################
 
+# Dependency checks.
+import dep_check
+
 # Python module imports.
 import os
 import sys
-import wx
-
-# Dependency checks.
-import dep_check
+if dep_check.wx_module:
+    import wx
 
 # Formatting.
 from test_suite.formatting import subtitle, summary_line, title
@@ -37,8 +38,9 @@
 from test_suite.unit_tests.unit_test_runner import Unit_test_runner
 
 # relax module imports.
-from gui.interpreter import Interpreter
-from gui.relax_gui import Main
+if dep_check.wx_module:
+    from gui.interpreter import Interpreter
+    from gui.relax_gui import Main
 from test_suite.relax_test_runner import GuiTestRunner, RelaxTestRunner
 from status import Status; status = Status()