Author: bugman Date: Tue Mar 10 09:39:07 2015 New Revision: 27791 URL: http://svn.gna.org/viewcvs/relax?rev=27791&view=rev Log: Merged revisions 27789 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r27789 | bugman | 2015-03-10 09:37:20 +0100 (Tue, 10 Mar 2015) | 7 lines Created the Sequence.test_bug_23372_read_csv system test. This is to catch bug #23372 (https://gna.org/bugs/?23372), the sequence.read failure with CSV files. It uses a truncated version of the CSV data file attached to sr #3219 (https://gna.org/support/?3219). ........ Added: branches/nmrglue/test_suite/shared_data/peak_lists/Sam.csv - copied unchanged from r27789, trunk/test_suite/shared_data/peak_lists/Sam.csv Modified: branches/nmrglue/ (props changed) branches/nmrglue/test_suite/system_tests/sequence.py Propchange: branches/nmrglue/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Tue Mar 10 09:39:07 2015 @@ -1 +1 @@ -/trunk:1-27787 +/trunk:1-27790 Modified: branches/nmrglue/test_suite/system_tests/sequence.py URL: http://svn.gna.org/viewcvs/relax/branches/nmrglue/test_suite/system_tests/sequence.py?rev=27791&r1=27790&r2=27791&view=diff ============================================================================== --- branches/nmrglue/test_suite/system_tests/sequence.py (original) +++ branches/nmrglue/test_suite/system_tests/sequence.py Tue Mar 10 09:39:07 2015 @@ -25,6 +25,7 @@ # relax module imports. from data_store import Relax_data_store; ds = Relax_data_store() +from pipe_control.mol_res_spin import spin_loop from status import Status; status = Status() from test_suite.system_tests.base_classes import SystemTestCase @@ -37,6 +38,21 @@ # Create the data pipe. self.interpreter.pipe.create('mf', 'mf') + + + def test_bug_23372_read_csv(self): + """Catch U{bug #23372<https://gna.org/bugs/?23372>}, the sequence.read failure with CSV files.""" + + # Load the sequence. + self.interpreter.sequence.read('Sam.csv', dir=status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', res_num_col=1, sep=',') + + # Check the sequence. + seq = [":330", ":331"] + i = 0 + self.assertEqual(len(cdp.mol[0].res), 2) + for spin, spin_id in spin_loop(return_id=True): + self.assertEqual(spin_id, seq[i]) + i += 0 def test_load_protein_asp_atoms_from_pdb(self):