r26260 - /trunk/test_suite/system_tests/relax_disp.py -- October 13, 2014 - 17:19

Author: tlinnet
Date: Mon Oct 13 17:19:00 2014
New Revision: 26260

URL: http://svn.gna.org/viewcvs/relax?rev=26260&view=rev
Log:
Fix for testing the raise of expected errors in systemtests.

The systemtest will not be tested, if python version is under version 2.7.

Bug #22801 (https://gna.org/bugs/?22801): Failure of the relax test suite on 
Python 2.5.

Modified:
    trunk/test_suite/system_tests/relax_disp.py

Modified: trunk/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=26260&r1=26259&r2=26260&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Mon Oct 13 17:19:00 2014
@@ -27,6 +27,7 @@
 from minfx.generic import generic_minimise
 from random import gauss
 import re, math
+from sys import version_info
 from tempfile import mkdtemp, NamedTemporaryFile
 
 
@@ -140,6 +141,18 @@
             # Store in the status object.
             if methodName in to_skip:
                 status.skipped_tests.append([methodName, 'matplotlib 
module', self._skip_type])
+
+        # If not python 2.7, bug #22801 (https://gna.org/bugs/?22801): 
Failure of the relax test suite on Python 2.5.
+        # It is not possible to call: with self.assertRaises() before 
version 2.7
+        if not version_info >= (2,7):
+            # The list of tests to skip.
+            to_skip = [
+                "test_bug_atul_srivastava"
+            ]
+
+            # Store in the status object.
+            if methodName in to_skip:
+                status.skipped_tests.append([methodName, 'python 2.7', 
self._skip_type])
 
 
     def setUp(self):