r17564 - /trunk/test_suite/system_tests/dasha.py -- September 25, 2012 - 16:42

Author: bugman
Date: Tue Sep 25 16:42:04 2012
New Revision: 17564

URL: http://svn.gna.org/viewcvs/relax?rev=17564&view=rev
Log:
Fix to the Dasha system test needed for the changes to the relax_data.read 
user function.


Modified:
    trunk/test_suite/system_tests/dasha.py

Modified: trunk/test_suite/system_tests/dasha.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/dasha.py?rev=17564&r1=17563&r2=17564&view=diff
==============================================================================
--- trunk/test_suite/system_tests/dasha.py (original)
+++ trunk/test_suite/system_tests/dasha.py Tue Sep 25 16:42:04 2012
@@ -89,11 +89,11 @@
         ri_data = [{'R1_600': 1.0, 'R2_600': 15.0, 'NOE_600': 0.9},
                    {'R1_600': 0.9, 'R2_600': 13.9, 'NOE_600': 0.79},
                    {'R2_600': 12.0, 'NOE_600': 0.6},
-                   {'R1_600': None, 'R2_600': None, 'NOE_600': None}]
+                   None]
         ri_data_err = [{'R1_600': 0.05, 'R2_600': 0.5, 'NOE_600': 0.05},
                        {'R1_600': 0.05, 'R2_600': 0.8, 'NOE_600': 0.05},
                        {'R2_600': 0.5, 'NOE_600': 0.05},
-                       {'R1_600': None, 'R2_600': None, 'NOE_600': None}]
+                       None]
 
         # Check the spin data.
         i = 0
@@ -121,9 +121,12 @@
             self.assertEqual(spin.rex, rex[i])
             self.assertAlmostEqual(spin.csa, csa[i])
             self.assertEqual(spin.chi2, chi2[i])
-            for ri_id in cdp.ri_ids:
-                if ri_id in ri_data[i].keys():
-                    self.assertEqual(spin.ri_data[ri_id], ri_data[i][ri_id])
+            if ri_data[i] == None:
+                self.assert_(not hasattr(spin, 'ri_data'))
+            else:
+                for ri_id in cdp.ri_ids:
+                    if ri_id in ri_data[i].keys():
+                        self.assertEqual(spin.ri_data[ri_id], 
ri_data[i][ri_id])
 
             # Increment the spin index.
             i += 1