r19239 - /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py -- March 27, 2013 - 15:26

Author: bugman
Date: Wed Mar 27 15:26:18 2013
New Revision: 19239

URL: http://svn.gna.org/viewcvs/relax?rev=19239&view=rev
Log:
Ported r8696 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r8695:8696 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp@r18123 .

.....
  r8696 | semor | 2009-01-28 15:44:32 +0100 (Wed, 28 Jan 2009) | 7 lines
  Changed paths:
     M /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
  
  Fixed a bug where the 'id' argument was not set.
  
  This was proposed by Ed in a post at:
  https://mail.gna.org/public/relax-devel/2009-01/msg00127.html
  (Message-id: <7f080ed10901280059y3303254bv89c0c1293e9916c0@xxxxxxxxxxxxxx>)
.....


Modified:
    branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py

Modified: branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py?rev=19239&r1=19238&r2=19239&view=diff
==============================================================================
--- branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py 
(original)
+++ branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py Wed 
Mar 27 15:26:18 2013
@@ -75,7 +75,7 @@
                 continue
 
             # The argument test.
-            self.assertRaises(RelaxNoneNumError, 
self.relax_disp_fns.calc_r2eff, delayT=data[1])
+            self.assertRaises(RelaxNoneNumError, 
self.relax_disp_fns.calc_r2eff, id='test', delayT=data[1])
 
 
     def test_relax_calc_r2eff_argfail_int_cpmg(self):
@@ -88,7 +88,7 @@
                 continue
 
             # The argument test.
-            self.assertRaises(RelaxNumError, self.relax_disp_fns.calc_r2eff, 
int_cpmg=data[1])
+            self.assertRaises(RelaxNumError, self.relax_disp_fns.calc_r2eff, 
id='test', int_cpmg=data[1])
 
 
     def test_relax_calc_r2eff_argfail_int_ref(self):
@@ -101,7 +101,7 @@
                 continue
 
             # The argument test.
-            self.assertRaises(RelaxNumError, self.relax_disp_fns.calc_r2eff, 
int_ref=data[1])
+            self.assertRaises(RelaxNumError, self.relax_disp_fns.calc_r2eff, 
id='test', int_ref=data[1])
 
 
     def test_relax_cpmg_delayT_argfail_id(self):