r20197 - in /branches/relax_disp: ./ test_suite/system_tests/n_state_model.py test_suite/system_tests/peak_lists.py -- June 18, 2013 - 17:37

Author: bugman
Date: Tue Jun 18 17:37:51 2013
New Revision: 20197

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

........
  r20194 | bugman | 2013-06-18 17:17:45 +0200 (Tue, 18 Jun 2013) | 5 lines
  
  Fix for the N_state_model.test_absolute_T system test for Mac OS X.
  
  The precision of the check needed to be decreased.
........
  r20195 | bugman | 2013-06-18 17:23:07 +0200 (Tue, 18 Jun 2013) | 5 lines
  
  The Peak_lists.test_bug_20873_peak_lists system test is now skipped if the 
C modules are not compiled.
  
  This test requires the presence of the C modules.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/system_tests/n_state_model.py
    branches/relax_disp/test_suite/system_tests/peak_lists.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 18 17:37:51 2013
@@ -1,1 +1,1 @@
-/trunk:1-20192
+/trunk:1-20196

Modified: branches/relax_disp/test_suite/system_tests/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/n_state_model.py?rev=20197&r1=20196&r2=20197&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/n_state_model.py (original)
+++ branches/relax_disp/test_suite/system_tests/n_state_model.py Tue Jun 18 
17:37:51 2013
@@ -266,7 +266,7 @@
 
             # Check the loaded and back-calculated absolute values.
             self.assertAlmostEqual(interatom.rdc['Gel'], T[i])
-            self.assertAlmostEqual(interatom.rdc_bc['Gel'], T_bc[i])
+            self.assertAlmostEqual(interatom.rdc_bc['Gel'], T_bc[i], 5)
 
             # Increment the spin index.
             i += 1

Modified: branches/relax_disp/test_suite/system_tests/peak_lists.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/peak_lists.py?rev=20197&r1=20196&r2=20197&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/peak_lists.py (original)
+++ branches/relax_disp/test_suite/system_tests/peak_lists.py Tue Jun 18 
17:37:51 2013
@@ -45,7 +45,7 @@
         super(Peak_lists, self).__init__(methodName)
 
         # Missing module.
-        if not dep_check.C_module_exp_fn and methodName in 
['test_bug_17276_peak_lists', 'test_ccpn_analysis']:
+        if not dep_check.C_module_exp_fn and methodName in 
['test_bug_17276_peak_lists', 'test_bug_20873_peak_lists', 
'test_ccpn_analysis']:
             # Store in the status object. 
             status.skipped_tests.append([methodName, 'Relax curve-fitting C 
module', self._skip_type])