Author: bugman Date: Tue Oct 20 09:26:27 2015 New Revision: 28067 URL: http://svn.gna.org/viewcvs/relax?rev=28067&view=rev Log: Updated the Mf.test_bug_23933_relax_data_read_ids system test to catch the RelaxMultiSpinIDError. This allows the system test to pass, as a RelaxMultiSpinIDError is expected. Modified: trunk/test_suite/system_tests/model_free.py Modified: trunk/test_suite/system_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/model_free.py?rev=28067&r1=28066&r2=28067&view=diff ============================================================================== --- trunk/test_suite/system_tests/model_free.py (original) +++ trunk/test_suite/system_tests/model_free.py Tue Oct 20 09:26:27 2015 @@ -35,6 +35,7 @@ from pipe_control import pipes from pipe_control.interatomic import interatomic_loop from pipe_control.mol_res_spin import spin_loop +from lib.errors import RelaxMultiSpinIDError from lib.physical_constants import N15_CSA from lib.io import DummyFileObject, open_read_file from status import Status; status = Status() @@ -496,8 +497,7 @@ self.interpreter.structure.load_spins(spin_id='@HE1') # Load the relaxation data. - self.interpreter.relax_data.read(ri_id='R1_600', ri_type='R1', frq=600402816.0, file='r1_600.txt', dir=path, res_num_col=1, data_col=2, error_col=3) - + self.assertRaises(RelaxMultiSpinIDError, self.interpreter.relax_data.read, ri_id='R1_600', ri_type='R1', frq=600402816.0, file='r1_600.txt', dir=path, res_num_col=1, data_col=2, error_col=3) def test_create_m4(self):