r27734 - /trunk/test_suite/system_tests/rdc.py -- March 02, 2015 - 18:19

Author: bugman
Date: Mon Mar  2 18:19:26 2015
New Revision: 27734

URL: http://svn.gna.org/viewcvs/relax?rev=27734&view=rev
Log:
Some more modifications for the Rdc.test_rdc_copy_different_spins system test.

One of the interatomic data containers does not have RDC data, as it is not 
present in the original
data pipe, hence this is checked for.  And the printouts have more formatting.


Modified:
    trunk/test_suite/system_tests/rdc.py

Modified: trunk/test_suite/system_tests/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/rdc.py?rev=27734&r1=27733&r2=27734&view=diff
==============================================================================
--- trunk/test_suite/system_tests/rdc.py        (original)
+++ trunk/test_suite/system_tests/rdc.py        Mon Mar  2 18:19:26 2015
@@ -106,10 +106,10 @@
         # Printout.
         print("\n\nInteratomic data containers for the 'orig' data pipe:")
         for interatom in interatomic_loop(pipe='orig'):
-            print("%s %s" % (interatom.spin_id1, interatom.spin_id2))
+            print("'%s' '%s'" % (interatom.spin_id1, interatom.spin_id2))
         print("\nInteratomic data containers for the 'new' data pipe:")
         for interatom in interatomic_loop(pipe='new'):
-            print("%s %s" % (interatom.spin_id1, interatom.spin_id2))
+            print("'%s' '%s'" % (interatom.spin_id1, interatom.spin_id2))
 
         # Load the RDCs into the first data pipe.
         self.interpreter.pipe.switch('orig')
@@ -129,7 +129,11 @@
             self.assertEqual(len(cdp.interatomic), 7)
             j = 0
             for interatom in interatomic_loop():
-                self.assertAlmostEqual(rdcs[i][j], interatom.rdc['tb'])
+                # Residue 6 in the 'new' data pipe has no RDCs.
+                if i == 1 and j == 1:
+                    self.assert_(not hasattr(interatom, 'rdc'))
+                else:
+                    self.assertAlmostEqual(rdcs[i][j], interatom.rdc['tb'])
                 j += 1