r21054 - in /branches/relax_disp: ./ test_suite/unit_tests/spin_testing_base.py -- October 10, 2013 - 14:23

Author: bugman
Date: Thu Oct 10 14:23:49 2013
New Revision: 21054

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

........
  r21053 | bugman | 2013-10-10 14:22:39 +0200 (Thu, 10 Oct 2013) | 3 lines
  
  Fix for the unit tests for the bug fix of r21051.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/unit_tests/spin_testing_base.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 10 14:23:49 2013
@@ -1,1 +1,1 @@
-/trunk:1-21051
+/trunk:1-21053

Modified: branches/relax_disp/test_suite/unit_tests/spin_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/unit_tests/spin_testing_base.py?rev=21054&r1=21053&r2=21054&view=diff
==============================================================================
--- branches/relax_disp/test_suite/unit_tests/spin_testing_base.py (original)
+++ branches/relax_disp/test_suite/unit_tests/spin_testing_base.py Thu Oct 10 
14:23:49 2013
@@ -409,17 +409,16 @@
 
 
     def test_create_spin_fail(self):
-        """Test the failure of spin creation (by supplying two spins with 
the same number).
-
-        The function tested is both pipe_control.mol_res_spin.create_spin() 
and
-        prompt.spin.create().
+        """Test the failure of spin creation (by supplying two spins with 
the same name and number).
+
+        The function tested is both pipe_control.mol_res_spin.create_spin() 
and prompt.spin.create().
         """
 
         # Create the first spin.
         self.spin_fns.create(spin_num=1, spin_name='P1', res_num=1, 
mol_name='Old mol')
 
         # Assert that a RelaxError occurs when the next added spin has the 
same number as the first.
-        self.assertRaises(RelaxError, self.spin_fns.create, spin_num=1, 
spin_name='P3', res_num=1, mol_name='Old mol')
+        self.assertRaises(RelaxError, self.spin_fns.create, spin_num=1, 
spin_name='P1', res_num=1, mol_name='Old mol')
 
 
     def test_delete_spin_name(self):