r20201 - in /branches/relax_disp: ./ test_suite/system_tests/frame_order.py -- June 18, 2013 - 18:16

Author: bugman
Date: Tue Jun 18 18:16:57 2013
New Revision: 20201

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

........
  r20200 | bugman | 2013-06-18 18:01:25 +0200 (Tue, 18 Jun 2013) | 5 lines
  
  Decreased the precision of the check in the 
Frame_order.test_rigid_data_to_rigid_model system test.
  
  This is to allow the test to pass on a MS Windows 7 test machine.
........

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

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 18 18:16:57 2013
@@ -1,1 +1,1 @@
-/trunk:1-20198
+/trunk:1-20200

Modified: branches/relax_disp/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/frame_order.py?rev=20201&r1=20200&r2=20201&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/frame_order.py (original)
+++ branches/relax_disp/test_suite/system_tests/frame_order.py Tue Jun 18 
18:16:57 2013
@@ -1218,7 +1218,7 @@
         self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'rigid_test.py')
 
         # Check the chi2 value.
-        self.assertAlmostEqual(cdp.chi2, 0.0113763520134)
+        self.assertAlmostEqual(cdp.chi2, 0.0113763520134, 5)
 
 
     def test_rigid_data_to_rotor_model(self):