r8157 - /1.3/test_suite/unit_tests/_prompt/test_noe.py -- December 05, 2008 - 21:14

Author: bugman
Date: Fri Dec  5 21:14:41 2008
New Revision: 8157

URL: http://svn.gna.org/viewcvs/relax?rev=8157&view=rev
Log:
Fixes for 2 of the noe.read() user function arg unit tests.


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

Modified: 1.3/test_suite/unit_tests/_prompt/test_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_noe.py?rev=8157&r1=8156&r2=8157&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_prompt/test_noe.py (original)
+++ 1.3/test_suite/unit_tests/_prompt/test_noe.py Fri Dec  5 21:14:41 2008
@@ -97,11 +97,11 @@
         # Loop over the data types.
         for data in DATA_TYPES:
             # Catch the int and bin arguments, and skip them.
-            if data[0] == 'int' or data[0] == 'bin':
+            if data[0] == 'None' or data[0] == 'int' or data[0] == 'bin':
                 continue
 
             # The argument test.
-            self.assertRaises(RelaxIntError, self.noe_fns.read, file='noes', 
lower_col=data[1])
+            self.assertRaises(RelaxNoneIntError, self.noe_fns.read, 
file='noes', lower_col=data[1])
 
 
     def test_read_argfail_upper_col(self):
@@ -110,11 +110,11 @@
         # Loop over the data types.
         for data in DATA_TYPES:
             # Catch the int and bin arguments, and skip them.
-            if data[0] == 'int' or data[0] == 'bin':
+            if data[0] == 'None' or data[0] == 'int' or data[0] == 'bin':
                 continue
 
             # The argument test.
-            self.assertRaises(RelaxIntError, self.noe_fns.read, file='noes', 
upper_col=data[1])
+            self.assertRaises(RelaxNoneIntError, self.noe_fns.read, 
file='noes', upper_col=data[1])
 
 
     def test_read_argfail_sep(self):