r26492 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/relax_disp.py -- November 10, 2014 - 18:37

Author: bugman
Date: Mon Nov 10 18:37:20 2014
New Revision: 26492

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

........
  r26485 | tlinnet | 2014-11-10 16:18:38 +0100 (Mon, 10 Nov 2014) | 3 lines
  
  Fix for systemtest Relax_disp.test_bug_atul_srivastava.
  
  The call to the expected RelaxError needed to be performed differently for 
erlier python versions that 2.7.
........

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 Mon Nov 10 18:37:20 2014
@@ -1 +1 @@
-/trunk:1-26477,26482-26483
+/trunk:1-26477,26482-26485

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=26492&r1=26491&r2=26492&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  Mon 
Nov 10 18:37:20 2014
@@ -141,18 +141,6 @@
             # 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):
@@ -1750,11 +1738,9 @@
             else:
                 constraints = False
                 min_algor = 'Newton'
-                with self.assertRaises(RelaxError):
-                    self.interpreter.minimise.grid_search(inc=GRID_INC)
-
-                with self.assertRaises(RelaxError):
-                    self.interpreter.minimise.execute(min_algor=min_algor, 
constraints=constraints)
+                self.assertRaises(RelaxError, 
self.interpreter.minimise.grid_search, inc=GRID_INC)
+                self.assertRaises(RelaxError, 
self.interpreter.minimise.execute, min_algor=min_algor, 
constraints=constraints)
+
         # Inspect.
         if False:
             # Loop over attributes.
@@ -1848,8 +1834,7 @@
         INSIGNIFICANCE = 1.0
 
         # Auto-analysis execution.
-        with self.assertRaises(RelaxError):
-            relax_disp.Relax_disp(pipe_name='relax_disp', 
results_dir=RESULTS_DIR, models=MODELS, grid_inc=GRID_INC, mc_sim_num=MC_NUM, 
modsel=MODSEL, insignificance=INSIGNIFICANCE, numeric_only=NUMERIC_ONLY)
+        self.assertRaises(RelaxError, relax_disp.Relax_disp, 
pipe_name='relax_disp', results_dir=RESULTS_DIR, models=MODELS, 
grid_inc=GRID_INC, mc_sim_num=MC_NUM, modsel=MODSEL, 
insignificance=INSIGNIFICANCE, numeric_only=NUMERIC_ONLY)
 
 
     def test_bug_negative_intensities_cpmg(self):