r26278 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/relax_disp.py -- October 14, 2014 - 13:42

Author: bugman
Date: Tue Oct 14 13:42:53 2014
New Revision: 26278

URL: http://svn.gna.org/viewcvs/relax?rev=26278&view=rev
Log:
Merged revisions 26260 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r26260 | tlinnet | 2014-10-13 17:19:00 +0200 (Mon, 13 Oct 2014) | 5 lines
  
  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:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 14 13:42:53 2014
@@ -1 +1 @@
-/trunk:1-26205,26208-26259
+/trunk:1-26205,26208-26260

Modified: branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py?rev=26278&r1=26277&r2=26278&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  Tue 
Oct 14 13:42:53 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):