Author: bugman Date: Tue Oct 6 16:22:55 2009 New Revision: 9588 URL: http://svn.gna.org/viewcvs/relax?rev=9588&view=rev Log: Fixed some calls to sequence.read() in the unit tests. Modified: 1.3/test_suite/unit_tests/relax_data_testing_base.py 1.3/test_suite/unit_tests/sequence_testing_base.py Modified: 1.3/test_suite/unit_tests/relax_data_testing_base.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/relax_data_testing_base.py?rev=9588&r1=9587&r2=9588&view=diff ============================================================================== --- 1.3/test_suite/unit_tests/relax_data_testing_base.py (original) +++ 1.3/test_suite/unit_tests/relax_data_testing_base.py Tue Oct 6 16:22:55 2009 @@ -75,7 +75,7 @@ path = sys.path[-1] # First read the residue sequence out of the Ap4Aase 600 MHz NOE data file. - sequence.read(file='Ap4Aase.Noe.600.bz2', dir=path+sep+'test_suite'+sep+'shared_data'+sep+'relaxation_data') + sequence.read(file='Ap4Aase.Noe.600.bz2', dir=path+sep+'test_suite'+sep+'shared_data'+sep+'relaxation_data', res_num_col=1, res_name_col=2) # Then read the data out of the same file. self.relax_data_fns.read(ri_label='NOE', frq_label='600', frq=600e6, file='Ap4Aase.Noe.600.bz2', dir=path+sep+'test_suite'+sep+'shared_data'+sep+'relaxation_data') Modified: 1.3/test_suite/unit_tests/sequence_testing_base.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/sequence_testing_base.py?rev=9588&r1=9587&r2=9588&view=diff ============================================================================== --- 1.3/test_suite/unit_tests/sequence_testing_base.py (original) +++ 1.3/test_suite/unit_tests/sequence_testing_base.py Tue Oct 6 16:22:55 2009 @@ -145,7 +145,7 @@ path = sys.path[-1] # Read the residue sequence out of the Ap4Aase 600 MHz NOE data file. - self.sequence_fns.read(file='Ap4Aase.Noe.600.bz2', dir=path+sep+'test_suite'+sep+'shared_data'+sep+'relaxation_data') + self.sequence_fns.read(file='Ap4Aase.Noe.600.bz2', dir=path+sep+'test_suite'+sep+'shared_data'+sep+'relaxation_data', res_num_col=1, res_name_col=2) # Get the data pipe. dp = pipes.get_pipe('orig')