r18426 - in /trunk/test_suite/gui_tests: model_free.py noe.py rx.py -- February 05, 2013 - 12:56

Author: bugman
Date: Tue Feb  5 12:56:36 2013
New Revision: 18426

URL: http://svn.gna.org/viewcvs/relax?rev=18426&view=rev
Log:
More wxPython version '2.9.4.1 gtk2 (classic)' bug avoidances in the GUI 
tests.

Now the auto-analyses do not check the gauges in the relax controller at the 
end of the auto NOE,
Rx, and model-free analyses, as reading gauge values is faulty in this 
version.  The Rx test is no
longer skipped for this wxPython version.


Modified:
    trunk/test_suite/gui_tests/model_free.py
    trunk/test_suite/gui_tests/noe.py
    trunk/test_suite/gui_tests/rx.py

Modified: trunk/test_suite/gui_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/model_free.py?rev=18426&r1=18425&r2=18426&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/model_free.py (original)
+++ trunk/test_suite/gui_tests/model_free.py Tue Feb  5 12:56:36 2013
@@ -342,7 +342,8 @@
         self.check_exceptions()
 
         # Check the relax controller.
-        if status.relax_mode != 'gui':
+        # FIXME: skipping the checks for certain wxPython bugs.
+        if status.relax_mode != 'gui' and wx.version() != '2.9.4.1 gtk2 
(classic)':
             self.assertEqual(self.app.gui.controller.mc_gauge_mf.GetValue(), 
100)
             
self.assertEqual(self.app.gui.controller.progress_gauge_mf.GetValue(), 100)
             self.assertEqual(self.app.gui.controller.main_gauge.GetValue(), 
100)

Modified: trunk/test_suite/gui_tests/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/noe.py?rev=18426&r1=18425&r2=18426&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/noe.py (original)
+++ trunk/test_suite/gui_tests/noe.py Tue Feb  5 12:56:36 2013
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2012 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2013 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -150,7 +150,8 @@
         self.check_exceptions()
 
         # Check the relax controller.
-        if status.relax_mode != 'gui':
+        # FIXME: skipping the checks for certain wxPython bugs.
+        if status.relax_mode != 'gui' and wx.version() != '2.9.4.1 gtk2 
(classic)':
             self.assertEqual(self.app.gui.controller.main_gauge.GetValue(), 
100)
 
         # The real data.

Modified: trunk/test_suite/gui_tests/rx.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/rx.py?rev=18426&r1=18425&r2=18426&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/rx.py (original)
+++ trunk/test_suite/gui_tests/rx.py Tue Feb  5 12:56:36 2013
@@ -55,12 +55,6 @@
             # Store in the status object. 
             status.skipped_tests.append([methodName, 'Relax curve-fitting C 
module', self._skip_type])
 
-        # Skip tests for wxPython 2.9.4.1 bugs.
-        skip = ['test_r1_analysis']
-        if wx.version() == '2.9.4.1 gtk2 (classic)' and methodName in skip:
-            # Store in the status object. 
-            status.skipped_tests.append([methodName, 'wxPython 2.9.4.1 gtk2 
bugs', self._skip_type])
-
 
     def check_curve_fitting(self):
         """Check the results of the curve-fitting."""
@@ -105,7 +99,6 @@
 
     def test_r1_analysis(self):
         """Test the r1 analysis."""
-        self.fail()
 
         # The path to the data files.
         data_path = status.install_path + sep + 'test_suite' + sep + 
'shared_data' + sep + 'curve_fitting' + sep
@@ -236,7 +229,8 @@
         self.check_exceptions()
 
         # Check the relax controller.
-        if status.relax_mode != 'gui':
+        # FIXME: skipping the checks for certain wxPython bugs.
+        if status.relax_mode != 'gui' and wx.version() != '2.9.4.1 gtk2 
(classic)':
             self.assertEqual(self.app.gui.controller.mc_gauge_rx.GetValue(), 
100)
             self.assertEqual(self.app.gui.controller.main_gauge.GetValue(), 
100)