r7398 - in /1.3/test_suite: shared_data/structures/ system_tests/ -- September 27, 2008 - 01:31

Author: bugman
Date: Sat Sep 27 01:31:51 2008
New Revision: 7398

URL: http://svn.gna.org/viewcvs/relax?rev=7398&view=rev
Log:
Updates to the test_load_results() system test.


Modified:
    1.3/test_suite/shared_data/structures/generate_str_results.py
    1.3/test_suite/shared_data/structures/str.bz2
    1.3/test_suite/system_tests/structure.py

Modified: 1.3/test_suite/shared_data/structures/generate_str_results.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/structures/generate_str_results.py?rev=7398&r1=7397&r2=7398&view=diff
==============================================================================
--- 1.3/test_suite/shared_data/structures/generate_str_results.py (original)
+++ 1.3/test_suite/shared_data/structures/generate_str_results.py Sat Sep 27 
01:31:51 2008
@@ -1,4 +1,4 @@
 import sys
 pipe.create('str', 'mf')
-structure.read_pdb(file='Ap4Aase_res1-12.pdb', dir='../structures', 
parser='internal')
+structure.read_pdb(file='Ap4Aase_res1-12.pdb', parser='internal')
 results.write('str', dir=None, force=True)

Modified: 1.3/test_suite/shared_data/structures/str.bz2
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/structures/str.bz2?rev=7398&r1=7397&r2=7398&view=diff
==============================================================================
Binary files - no diff available.

Modified: 1.3/test_suite/system_tests/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/structure.py?rev=7398&r1=7397&r2=7398&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/structure.py (original)
+++ 1.3/test_suite/system_tests/structure.py Sat Sep 27 01:31:51 2008
@@ -48,7 +48,7 @@
         """Load the PDB file using the information in a results file."""
 
         # Path of the files.
-        path = sys.path[-1] + '/test_suite/shared_data/results_files'
+        path = sys.path[-1] + '/test_suite/shared_data/structures'
 
         # Read the results file.
         self.relax.interpreter._Results.read(file='str', dir=path)
@@ -59,7 +59,7 @@
         # Test the structure metadata.
         self.assert_(hasattr(cdp, 'structure'))
         self.assertEqual(cdp.structure.file, ['Ap4Aase_res1-12.pdb'])
-        self.assertEqual(cdp.structure.path, ['../structures'])
+        self.assertEqual(cdp.structure.path, [''])
         self.assert_(hasattr(cdp.structure, 'structural_data'))
         self.assert_(len(cdp.structure.structural_data))