mailr27447 - /trunk/test_suite/test_suite_runner.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on February 03, 2015 - 09:41:
Author: bugman
Date: Tue Feb  3 09:41:12 2015
New Revision: 27447

URL: http://svn.gna.org/viewcvs/relax?rev=27447&view=rev
Log:
Reverted r27243, the skipping of the GUI tests on wxPython 2.8.

The command used was:
svn merge -r27243:r27242 .

This was discussed at 
http://thread.gmane.org/gmane.science.nmr.relax.devel/7502/focus=7512.

.....
  r27243 | bugman | 2015-01-20 15:13:19 +0100 (Tue, 20 Jan 2015) | 6 lines
  Changed paths:
     M /trunk/test_suite/test_suite_runner.py
  
  The GUI tests are now skipped for wxPython version <= 2.8 due to bugs 
causing fatal segfaults.
  
  This follows from 
http://thread.gmane.org/gmane.science.nmr.relax.devel/7502.  These wxPython
  versions are simply too buggy.
.....


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=27447&r1=27446&r2=27447&view=diff
==============================================================================
--- trunk/test_suite/test_suite_runner.py       (original)
+++ trunk/test_suite/test_suite_runner.py       Tue Feb  3 09:41:12 2015
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2015 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -140,7 +140,7 @@
             title(file=sys.stdout, text='GUI tests')
 
             # Run the tests.
-            if dep_check.wx_module and 
dep_check.version_comparison(dep_check.wx_version, '2.9') >= 0:
+            if dep_check.wx_module:
                 # Set up the GUI if needed (i.e. not in GUI mode already).
                 app = wx.GetApp()
                 if app == None:
@@ -166,10 +166,7 @@
 
             # No wx module installed.
             else:
-                if dep_check.wx_module and 
dep_check.version_comparison(dep_check.wx_version, '2.9') == -1:
-                    print("All GUI tests skipped to avoid segfaults due to 
bugs in wxPython versions <= 2.8.\n")
-                else:
-                    print("All GUI tests skipped due to the missing/broken 
wx module.\n")
+                print("All GUI tests skipped due to the missing/broken wx 
module.\n")
                 self.gui_result = 'skip'
 
             # Print out a summary of the test suite.




Related Messages


Powered by MHonArc, Updated Tue Feb 03 10:00:04 2015