r24382 - /trunk/test_suite/system_tests/diffusion_tensor.py -- July 01, 2014 - 17:16

Author: bugman
Date: Tue Jul  1 17:16:30 2014
New Revision: 24382

URL: http://svn.gna.org/viewcvs/relax?rev=24382&view=rev
Log:
Fixes for the Diffusion_tensor system tests due to the recent PDB file 
changes.

Prior to the comparison of the generated PDB files, all REMARK PDB lines are 
now stripped out.


Modified:
    trunk/test_suite/system_tests/diffusion_tensor.py

Modified: trunk/test_suite/system_tests/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/diffusion_tensor.py?rev=24382&r1=24381&r2=24382&view=diff
==============================================================================
--- trunk/test_suite/system_tests/diffusion_tensor.py   (original)
+++ trunk/test_suite/system_tests/diffusion_tensor.py   Tue Jul  1 17:16:30 
2014
@@ -497,14 +497,24 @@
         real_data = file.readlines()
         file.close()
 
+        # Strip out all remark lines.
+        new_data_stripped = []
+        for line in new_data:
+            if line[:6] != 'REMARK':
+                new_data_stripped.append(line)
+        real_data_stripped = []
+        for line in real_data:
+            if line[:6] != 'REMARK':
+                real_data_stripped.append(line)
+
         # Check the data.
-        self.assertEqual(len(real_data), len(new_data))
-        for i in range(len(real_data)):
+        self.assertEqual(len(real_data_stripped), len(new_data_stripped))
+        for i in range(len(real_data_stripped)):
             # Print the PDB line, for debugging.
-            print(real_data[i][0:-1])
+            print(real_data_stripped[i][0:-1])
 
             # Check the line.
-            self.assertEqual(real_data[i], new_data[i])
+            self.assertEqual(real_data_stripped[i], new_data_stripped[i])
 
 
     def test_create_diff_tensor_pdb_sphere(self):
@@ -529,14 +539,24 @@
         real_data = file.readlines()
         file.close()
 
+        # Strip out all remark lines.
+        new_data_stripped = []
+        for line in new_data:
+            if line[:6] != 'REMARK':
+                new_data_stripped.append(line)
+        real_data_stripped = []
+        for line in real_data:
+            if line[:6] != 'REMARK':
+                real_data_stripped.append(line)
+
         # Check the data.
-        self.assertEqual(len(real_data), len(new_data))
-        for i in range(len(real_data)):
+        self.assertEqual(len(real_data_stripped), len(new_data_stripped))
+        for i in range(len(real_data_stripped)):
             # Print the PDB line, for debugging.
-            print(real_data[i][0:-1])
+            print(real_data_stripped[i][0:-1])
 
             # Check the line.
-            self.assertEqual(real_data[i], new_data[i])
+            self.assertEqual(real_data_stripped[i], new_data_stripped[i])
 
 
     def test_create_diff_tensor_pdb_spheroid(self):
@@ -561,14 +581,24 @@
         real_data = file.readlines()
         file.close()
 
+        # Strip out all remark lines.
+        new_data_stripped = []
+        for line in new_data:
+            if line[:6] != 'REMARK':
+                new_data_stripped.append(line)
+        real_data_stripped = []
+        for line in real_data:
+            if line[:6] != 'REMARK':
+                real_data_stripped.append(line)
+
         # Check the data.
-        self.assertEqual(len(real_data), len(new_data))
-        for i in range(len(real_data)):
+        self.assertEqual(len(real_data_stripped), len(new_data_stripped))
+        for i in range(len(real_data_stripped)):
             # Print the PDB line, for debugging.
-            print(real_data[i][0:-1])
+            print(real_data_stripped[i][0:-1])
 
             # Check the line.
-            self.assertEqual(real_data[i], new_data[i])
+            self.assertEqual(real_data_stripped[i], new_data_stripped[i])
 
 
     def test_init_ellipsoid_param_types_0(self):