r16148 - in /branches/uf_redesign: ./ test_suite/unit_tests/molecule_testing_base.py -- May 09, 2012 - 12:21

Author: bugman
Date: Wed May  9 12:21:28 2012
New Revision: 16148

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

........
  r16144 | bugman | 2012-05-09 11:33:44 +0200 (Wed, 09 May 2012) | 3 lines
  
  Fix for the test_name_molecule_many_fail() unit test - RelaxMultiMolIDError 
is now raised.
........

Modified:
    branches/uf_redesign/   (props changed)
    branches/uf_redesign/test_suite/unit_tests/molecule_testing_base.py

Propchange: branches/uf_redesign/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May  9 12:21:28 2012
@@ -1,1 +1,1 @@
-/1.3:1-16140
+/1.3:1-16147

Modified: branches/uf_redesign/test_suite/unit_tests/molecule_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/unit_tests/molecule_testing_base.py?rev=16148&r1=16147&r2=16148&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/unit_tests/molecule_testing_base.py 
(original)
+++ branches/uf_redesign/test_suite/unit_tests/molecule_testing_base.py Wed 
May  9 12:21:28 2012
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2007-2011 Edward d'Auvergne                                  
 #
+# Copyright (C) 2007-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -24,7 +24,7 @@
 from data import Relax_data_store; ds = Relax_data_store()
 from generic_fns.mol_res_spin import copy_residue, create_residue
 from generic_fns import pipes
-from relax_errors import RelaxError, RelaxNoPipeError, 
RelaxResSelectDisallowError, RelaxSpinSelectDisallowError
+from relax_errors import RelaxError, RelaxMultiMolIDError, RelaxNoPipeError, 
RelaxResSelectDisallowError, RelaxSpinSelectDisallowError
 from test_suite.unit_tests.base_classes import UnitTestCase
 
 
@@ -390,4 +390,4 @@
         self.setup_data()
 
         # Test for the failure.
-        self.assertRaises(RelaxError, self.molecule_fns.name, mol_id='#Old 
mol,New mol', name='K')
+        self.assertRaises(RelaxMultiMolIDError, self.molecule_fns.name, 
mol_id='#Old mol,New mol', name='K')