r18425 - in /trunk/test_suite/gui_tests: rx.py state.py -- February 05, 2013 - 12:35

Author: bugman
Date: Tue Feb  5 12:35:30 2013
New Revision: 18425

URL: http://svn.gna.org/viewcvs/relax?rev=18425&view=rev
Log:
Added skips for some GUI tests when wxPython version '2.9.4.1 gtk2 (classic)' 
is used.

There are a number of bugs in this version which cannot be worked around in 
certain GUI tests, so
they must be skipped.


Modified:
    trunk/test_suite/gui_tests/rx.py
    trunk/test_suite/gui_tests/state.py

Modified: trunk/test_suite/gui_tests/rx.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/rx.py?rev=18425&r1=18424&r2=18425&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/rx.py (original)
+++ trunk/test_suite/gui_tests/rx.py Tue Feb  5 12:35:30 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).         
 #
 #                                                                            
 #
@@ -41,7 +41,7 @@
     """Class for testing various aspects specific to the R1 and R2 
analyses."""
 
     def __init__(self, methodName='runTest'):
-        """Skip the tests if the C modules are non-functional.
+        """Skip the tests if the C modules are non-functional or for 
wxPython bugs.
 
         @keyword methodName:    The name of the test.
         @type methodName:       str
@@ -54,6 +54,12 @@
         if not dep_check.C_module_exp_fn:
             # 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):
@@ -99,6 +105,7 @@
 
     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

Modified: trunk/test_suite/gui_tests/state.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/state.py?rev=18425&r1=18424&r2=18425&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/state.py (original)
+++ trunk/test_suite/gui_tests/state.py Tue Feb  5 12:35:30 2013
@@ -37,6 +37,23 @@
 
 class State(GuiTestCase):
     """Class for testing various aspects specific to saved states."""
+
+    def __init__(self, methodName='runTest'):
+        """Skip certain tests due to wxPython bugs.
+
+        @keyword methodName:    The name of the test.
+        @type methodName:       str
+        """
+
+        # Execute the base class method.
+        super(State, self).__init__(methodName)
+
+        # Skip tests for wxPython 2.9.4.1 bugs.
+        skip = ['test_load_state_no_gui']
+        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 test_bug_20480(self):
         """Catch bug #20480 (https://gna.org/bugs/?20480), the failure to 
load a relax state in the GUI.