r6585 - /1.3/test_suite/unit_tests/_prompt/test_relax_data.py -- June 29, 2008 - 14:58

Author: bugman
Date: Sun Jun 29 14:47:43 2008
New Revision: 6585

URL: http://svn.gna.org/viewcvs/relax?rev=6585&view=rev
Log:
Brought the relax_data.copy() user function arg unit tests into line with the 
other copy() functions.


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

Modified: 1.3/test_suite/unit_tests/_prompt/test_relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_relax_data.py?rev=6585&r1=6584&r2=6585&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_prompt/test_relax_data.py (original)
+++ 1.3/test_suite/unit_tests/_prompt/test_relax_data.py Sun Jun 29 14:47:43 
2008
@@ -85,12 +85,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the str argument, and skip it.
-            if data[0] == 'str':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxStrError, self.relax_data_fns.copy, 
pipe_from=data[1])
+            # Catch the None and str arguments, and skip them.
+            if data[0] == 'None' or data[0] == 'str':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxNoneStrError, self.relax_data_fns.copy, 
pipe_from=data[1])
 
 
     def test_copy_argfail_pipe_to(self):
@@ -98,12 +98,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the str argument, and skip it.
-            if data[0] == 'str':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxStrError, self.relax_data_fns.copy, 
pipe_from='', pipe_to=data[1])
+            # Catch the None and str arguments, and skip them.
+            if data[0] == 'None' or data[0] == 'str':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxNoneStrError, self.relax_data_fns.copy, 
pipe_from='', pipe_to=data[1])
 
 
     def test_copy_argfail_ri_label(self):