r19913 - in /branches/relax_disp: ./ test_suite/system_tests/peak_lists.py -- June 06, 2013 - 20:12

Author: bugman
Date: Thu Jun  6 20:12:30 2013
New Revision: 19913

URL: http://svn.gna.org/viewcvs/relax?rev=19913&view=rev
Log:
Merged revisions 19912 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19912 | bugman | 2013-06-06 20:11:56 +0200 (Thu, 06 Jun 2013) | 8 lines
  
  Created the Peak_lists.test_bug_20873_peak_lists system test to catch bug 
#20873.
  
  This was reported by Troels E. Linnet (http://gna.org/users/tlinnet) at 
https://gna.org/bugs/?20873.
  
  The test has been created by copying the user function calls from the 
original bug report and
  slightly modifying them to suite a 'relax_fit' analysis type.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/system_tests/peak_lists.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  6 20:12:30 2013
@@ -1,1 +1,1 @@
-/trunk:1-19910
+/trunk:1-19912

Modified: branches/relax_disp/test_suite/system_tests/peak_lists.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/peak_lists.py?rev=19913&r1=19912&r2=19913&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/peak_lists.py (original)
+++ branches/relax_disp/test_suite/system_tests/peak_lists.py Thu Jun  6 
20:12:30 2013
@@ -62,6 +62,22 @@
 
         # Execute the script.
         self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bug_17276_peak_lists.py')
+
+
+    def test_bug_20873_peak_lists(self):
+        """Test catching U{bug #20873<https://gna.org/bugs/?20873>}, the 
custom peak intensity reading with a list of spectrum_ids submitted by Troels 
E. Linnet."""
+
+        # The path to the files.
+        path = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists'
+
+        # First create a data pipe.
+        self.interpreter.pipe.create(pipe_name='origin rx', 
pipe_type='relax_fit', bundle='rx')
+
+        # Load the spin systems.
+        self.interpreter.sequence.read(file='test.seq', dir=path, 
spin_id_col=None, mol_name_col=1, res_num_col=2, res_name_col=3, 
spin_num_col=4, spin_name_col=5, sep=None, spin_id=None)
+
+        # Load the intensities.
+        self.interpreter.spectrum.read_intensities(file='test.seq', 
dir=path, spectrum_id=[2,0], heteronuc='N', proton='HN', int_method='height', 
int_col=[6, 7], spin_id_col=None, mol_name_col=1, res_num_col=2, 
res_name_col=3, spin_num_col=4, spin_name_col=5, sep=None, spin_id=None, 
ncproc=None) 
 
 
     def test_ccpn_analysis(self):