Author: bugman Date: Mon Jul 18 14:27:18 2011 New Revision: 13689 URL: http://svn.gna.org/viewcvs/relax?rev=13689&view=rev Log: Merged revisions 13686 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r13686 | bugman | 2011-07-18 14:24:00 +0200 (Mon, 18 Jul 2011) | 3 lines Bug fix in one of the relaxation curve-fitting system tests - 'volume' should have been 'point sum'. ........ Modified: branches/gui_testing/ (props changed) branches/gui_testing/test_suite/system_tests/relax_fit.py Propchange: branches/gui_testing/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Jul 18 14:27:18 2011 @@ -1,1 +1,1 @@ -/1.3:1-13684 +/1.3:1-13688 Modified: branches/gui_testing/test_suite/system_tests/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/relax_fit.py?rev=13689&r1=13688&r2=13689&view=diff ============================================================================== --- branches/gui_testing/test_suite/system_tests/relax_fit.py (original) +++ branches/gui_testing/test_suite/system_tests/relax_fit.py Mon Jul 18 14:27:18 2011 @@ -143,7 +143,7 @@ """Test the relaxation curve fitting C modules.""" # The intensity type. - ds.int_type = 'volume' + ds.int_type = 'point sum' # Execute the script. self.interpreter.run(script_file=status.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_fit.py')