Author: tlinnet Date: Wed Dec 3 20:40:49 2014 New Revision: 26939 URL: http://svn.gna.org/viewcvs/relax?rev=26939&view=rev Log: Expanded systemtest Nmrglue.test_nmrglue_read_several to use a new user function io.file_list(). Task #7873 (https://gna.org/task/index.php?7873): Write wrapper function to nmrglue, to read .ft2 files and process them. Homepage: http://www.nmrglue.com/ Link to nmrglue discussion: https://groups.google.com/forum/#!forum/nmrglue-discuss The code is develop at Github: https://github.com/jjhelmus/nmrglue/ Documentation: http://nmrglue.readthedocs.org/en/latest/index.html Modified: branches/nmrglue/test_suite/system_tests/nmrglue.py Modified: branches/nmrglue/test_suite/system_tests/nmrglue.py URL: http://svn.gna.org/viewcvs/relax/branches/nmrglue/test_suite/system_tests/nmrglue.py?rev=26939&r1=26938&r2=26939&view=diff ============================================================================== --- branches/nmrglue/test_suite/system_tests/nmrglue.py (original) +++ branches/nmrglue/test_suite/system_tests/nmrglue.py Wed Dec 3 20:40:49 2014 @@ -92,7 +92,17 @@ # Get the file list matching a glob pattern. ft2_glob_pat = '128_*_FT.ft2' - basename_list, file_root_list = get_file_list(glob_pattern=ft2_glob_pat, dir=ft2_folder_1) + self.interpreter.io.file_list(glob=ft2_glob_pat, dir=ft2_folder_1, id=None) + + # Test the list of stored id. + self.assertEqual(cdp.io_ids[-1], ft2_glob_pat) + + self.assertEqual(cdp.io_basename[ft2_glob_pat], ['128_0_FT.ft2', '128_1_FT.ft2']) + self.assertEqual(cdp.io_file_root[ft2_glob_pat], ['128_0_FT', '128_1_FT']) + self.assertEqual(cdp.io_dir[ft2_glob_pat], ft2_folder_1) + + # Extract from cdp. + basename_list, file_root_list = cdp.io_basename[ft2_glob_pat], cdp.io_file_root[ft2_glob_pat] # First test that expected RelaxErrors are raised. self.assertRaises(RelaxError, self.interpreter.spectrum.nmrglue_read, file=basename_list, dir=ft2_folder_1, spectrum_id='test')