r26018 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/relax_disp.py -- September 24, 2014 - 17:19

Author: bugman
Date: Wed Sep 24 17:19:27 2014
New Revision: 26018

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

........
  r26017 | bugman | 2014-09-24 17:16:31 +0200 (Wed, 24 Sep 2014) | 5 lines
  
  Reactivated the Relax_disp.test_m61b_data_to_m61b system test, but 
blacklisted it.
  
  This will allow the test to be executed if the --no-skip command line 
option is used.
........

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 Wed Sep 24 17:19:27 2014
@@ -1 +1 @@
-/trunk:1-26013
+/trunk:1-26017

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=26018&r1=26017&r2=26018&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  Wed 
Sep 24 17:19:27 2014
@@ -73,6 +73,13 @@
 
         # Execute the base class method.
         super(Relax_disp, self).__init__(methodName)
+
+        # Tests to skip.
+        blacklist = [
+            'test_m61b_data_to_m61b'
+        ]
+        if methodName in blacklist:
+            status.skipped_tests.append([methodName, None, self._skip_type])
 
         # Missing module.
         if not dep_check.C_module_exp_fn:
@@ -5769,7 +5776,7 @@
             spin_index += 1
 
 
-    def xxx_test_m61b_data_to_m61b(self):
+    def test_m61b_data_to_m61b(self):
         """Test the relaxation dispersion 'M61 skew' model curve fitting to 
fixed time synthetic data."""
 
         # Execute the script.