r17223 - in /trunk/test_suite: gui_tests/base_classes.py system_tests/base_classes.py system_tests/frame_order.py -- July 10, 2012 - 14:37

Author: bugman
Date: Tue Jul 10 14:37:33 2012
New Revision: 17223

URL: http://svn.gna.org/viewcvs/relax?rev=17223&view=rev
Log:
Fix for the reporting of skipped GUI tests.

The Frame_order tests skipped because of the missing Scipy module were been 
labelled as system
rather than GUI tests.


Modified:
    trunk/test_suite/gui_tests/base_classes.py
    trunk/test_suite/system_tests/base_classes.py
    trunk/test_suite/system_tests/frame_order.py

Modified: trunk/test_suite/gui_tests/base_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/base_classes.py?rev=17223&r1=17222&r2=17223&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/base_classes.py (original)
+++ trunk/test_suite/gui_tests/base_classes.py Tue Jul 10 14:37:33 2012
@@ -57,11 +57,12 @@
     def __init__(self, methodName=None):
         """Set up the test case class for the system tests."""
 
+        # A string used for classifying skipped tests.
+        if not hasattr(self, '_skip_type'):
+            self._skip_type = 'gui'
+
         # Execute the TestCase __init__ method.
         super(GuiTestCase, self).__init__(methodName)
-
-        # A string used for classifying skipped tests.
-        self._skip_type = 'gui'
 
 
     def _execute_uf(self, *args, **kargs):

Modified: trunk/test_suite/system_tests/base_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/base_classes.py?rev=17223&r1=17222&r2=17223&view=diff
==============================================================================
--- trunk/test_suite/system_tests/base_classes.py (original)
+++ trunk/test_suite/system_tests/base_classes.py Tue Jul 10 14:37:33 2012
@@ -45,7 +45,8 @@
         super(SystemTestCase, self).__init__(methodName)
 
         # A string used for classifying skipped tests.
-        self._skip_type = 'system'
+        if not hasattr(self, '_skip_type'):
+            self._skip_type = 'system'
 
         # Load the interpreter.
         self.interpreter = Interpreter(show_script=False, quit=False, 
raise_relax_error=True)

Modified: trunk/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/frame_order.py?rev=17223&r1=17222&r2=17223&view=diff
==============================================================================
--- trunk/test_suite/system_tests/frame_order.py (original)
+++ trunk/test_suite/system_tests/frame_order.py Tue Jul 10 14:37:33 2012
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2011 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -71,13 +71,13 @@
         @type methodName:       str
         """
 
+        # Execute the base class method.
+        super(Frame_order, self).__init__(methodName)
+
         # Missing module.
         if not dep_check.scipy_module:
             # Store in the status object. 
-            status.skipped_tests.append([methodName, 'Scipy', 'system'])
-
-        # Execute the base class method.
-        super(Frame_order, self).__init__(methodName)
+            status.skipped_tests.append([methodName, 'Scipy', 
self._skip_type])
 
 
     def setUp(self):