Author: bugman
Date: Mon Nov 10 23:32:07 2014
New Revision: 26500
URL: http://svn.gna.org/viewcvs/relax?rev=26500&view=rev
Log:
Fix for the Relax_disp.test_cpmg_synthetic_dx_map_points system test for
certain systems.
This change is to allow the test to pass on Python 2.5 and 3.1 on a 32-bit
GNU/Linux system. This
may be related to 32-bit numpy 1.6.2 verses later numpy versions causing
precision differences.
Modified:
trunk/test_suite/system_tests/relax_disp.py
Modified: trunk/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=26500&r1=26499&r2=26500&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Mon Nov 10 23:32:07 2014
@@ -2914,11 +2914,17 @@
'0 2.00000 0.99000 1000.00000 6185.84926 0
2.00000 0.99000 1000.00000 6185.84926 '+"\n",
'1 1.92453 0.98961 1034.72206 6396.02770 1
1.92453 0.98961 1034.72206 6396.02770 '+"\n",
]
+ res_file2 = [
+ '# i dw pA kex chi2 i_sort
dw_sort pA_sort kex_sort chi2_sort '+"\n",
+ '0 2.00000 0.99000 1000.00000 6185.84926 0
2.00000 0.99000 1000.00000 6185.84926 '+"\n",
+ '1 1.92452 0.98961 1034.72424 6396.02439 1
1.92452 0.98961 1034.72424 6396.02439 '+"\n",
+ ] # Python 2.5 and 3.1.
file = open(point_par, 'r')
lines = file.readlines()
file.close()
for i in range(len(res_file)):
- self.assertEqual(res_file[i], lines[i])
+ if lines[i] != res_file[i] and lines[i] != res_file2[i]:
+ self.assertEqual(res_file[i], lines[i])
print("\nChecking the matplotlib surface plot file.")
res_file = [
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
