r12155 - /1.3/test_suite/system_tests/state.py -- January 04, 2011 - 16:06

Author: bugman
Date: Tue Jan  4 16:06:42 2011
New Revision: 12155

URL: http://svn.gna.org/viewcvs/relax?rev=12155&view=rev
Log:
The data pipe system test is avoiding the frame order data pipe.

This allows the test to pass without scipy installed.


Modified:
    1.3/test_suite/system_tests/state.py

Modified: 1.3/test_suite/system_tests/state.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/state.py?rev=12155&r1=12154&r2=12155&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/state.py (original)
+++ 1.3/test_suite/system_tests/state.py Tue Jan  4 16:06:42 2011
@@ -98,9 +98,13 @@
         # Remove the data pipe.
         ds.__reset__()
 
+        # The data pipe list.
+        pipe_types = VALID_TYPES
+        pipe_types.pop(pipe_types.index("frame order"))
+
         # Create a few data pipes.
-        for i in range(len(VALID_TYPES)):
-            self.interpreter.pipe.create('test' + repr(i), VALID_TYPES[i])
+        for i in range(len(pipe_types)):
+            self.interpreter.pipe.create('test' + repr(i), pipe_types[i])
 
         # Write the results.
         self.interpreter.state.save(self.tmpfile)
@@ -112,11 +116,11 @@
         self.interpreter.state.load(self.tmpfile)
 
         # Test the pipes.
-        for i in range(len(VALID_TYPES)):
+        for i in range(len(pipe_types)):
             # Name.
             name = 'test' + repr(i)
             self.assert_(name in ds)
 
             # Type.
             pipe = get_pipe(name)
-            self.assertEqual(pipe.pipe_type, VALID_TYPES[i])
+            self.assertEqual(pipe.pipe_type, pipe_types[i])