r8895 - /1.3/test_suite/unit_tests/_prompt/test_molecule.py -- March 02, 2009 - 17:34

Author: bugman
Date: Mon Mar  2 17:34:06 2009
New Revision: 8895

URL: http://svn.gna.org/viewcvs/relax?rev=8895&view=rev
Log:
Fix for the test_name_argfail_mol_id() unit test.

The mol_id can be None, i.e. for naming unnamed molecules.


Modified:
    1.3/test_suite/unit_tests/_prompt/test_molecule.py

Modified: 1.3/test_suite/unit_tests/_prompt/test_molecule.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_molecule.py?rev=8895&r1=8894&r2=8895&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_prompt/test_molecule.py (original)
+++ 1.3/test_suite/unit_tests/_prompt/test_molecule.py Mon Mar  2 17:34:06 
2009
@@ -139,12 +139,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the str arguments, and skip them.
-            if data[0] == 'str':
+            # Catch the None and str arguments, and skip them.
+            if data[0] == 'None' or data[0] == 'str':
                 continue
 
             # The argument test.
-            self.assertRaises(RelaxStrError, self.molecule_fns.name, 
mol_id=data[1])
+            self.assertRaises(RelaxNoneStrError, self.molecule_fns.name, 
mol_id=data[1])
 
 
     def test_name_argfail_name(self):