r9400 - /1.3/test_suite/unit_tests/_prompt/test_eliminate.py -- August 26, 2009 - 17:15

Author: bugman
Date: Wed Aug 26 17:15:28 2009
New Revision: 9400

URL: http://svn.gna.org/viewcvs/relax?rev=9400&view=rev
Log:
Fixes for the eliminate arg unit tests.


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

Modified: 1.3/test_suite/unit_tests/_prompt/test_eliminate.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_eliminate.py?rev=9400&r1=9399&r2=9400&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_prompt/test_eliminate.py (original)
+++ 1.3/test_suite/unit_tests/_prompt/test_eliminate.py Wed Aug 26 17:15:28 
2009
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2008 Edward d'Auvergne                                       
 #
+# Copyright (C) 2008-2009 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -25,11 +25,17 @@
 
 # relax module imports.
 from prompt.eliminate import Eliminate
-from relax_errors import RelaxFunctionError, RelaxNoneTupleError
+from relax_errors import RelaxNoneFunctionError, RelaxTupleError
 
 # Unit test imports.
 from data_types import DATA_TYPES
 import fake_relax
+
+
+
+def dummy_function():
+    pass
+
 
 
 class Test_eliminate(TestCase):
@@ -49,7 +55,7 @@
                 continue
 
             # The argument test.
-            self.assertRaises(RelaxFunctionError, 
self.eliminate_fns.eliminate, function=data[1])
+            self.assertRaises(RelaxNoneFunctionError, 
self.eliminate_fns.eliminate, function=data[1])
 
 
     def test_eliminate_args(self):
@@ -62,4 +68,4 @@
                 continue
 
             # The argument test.
-            self.assertRaises(RelaxNoneTupleError, 
self.eliminate_fns.eliminate, args=data[1])
+            self.assertRaises(RelaxTupleError, self.eliminate_fns.eliminate, 
function=dummy_function, args=data[1])