r9492 - /1.3/test_suite/system_tests/results.py -- September 10, 2009 - 16:54

Author: bugman
Date: Thu Sep 10 16:54:55 2009
New Revision: 9492

URL: http://svn.gna.org/viewcvs/relax?rev=9492&view=rev
Log:
The test_write_read_pipes() system test is now using the VALID_TYPES module 
variable to get all pipes.


Modified:
    1.3/test_suite/system_tests/results.py

Modified: 1.3/test_suite/system_tests/results.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/results.py?rev=9492&r1=9491&r2=9492&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/results.py (original)
+++ 1.3/test_suite/system_tests/results.py Thu Sep 10 16:54:55 2009
@@ -28,6 +28,7 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
+from generic_fns.pipes import VALID_TYPES
 
 
 class Results(TestCase):
@@ -77,9 +78,8 @@
         ds.__reset__()
 
         # Create a few data pipes.
-        pipe_types = ['ct', 'frame order', 'jw', 'hybrid', 'mf', 'N-state', 
'noe', 'relax_fit', 'relax_disp', 'srls']
-        for i in range(len(pipe_types)):
-            self.relax.interpreter._Pipe.create('test' + repr(i), 
pipe_types[i])
+        for i in range(len(VALID_TYPES)):
+            self.relax.interpreter._Pipe.create('test' + repr(i), 
VALID_TYPES[i])
 
         # Write the results.
         self.relax.interpreter._Results.write(file=self.tmpfile, dir=None)
@@ -91,11 +91,11 @@
         self.relax.interpreter._Results.read(file=self.tmpfile)
 
         # Test the pipes.
-        for i in range(len(pipe_types)):
+        for i in range(len(VALID_TYPES)):
             # Name.
             name = 'test' + repr(i)
             self.assert_(haskey(ds, name))
 
             # Type.
             pipe = get_pipe(name)
-            self.assertEqual(pipe.name, pipe_types[i])
+            self.assertEqual(pipe.name, VALID_TYPES[i])