r16636 - /branches/uf_redesign/test_suite/system_tests/pipes.py -- June 04, 2012 - 16:32

Author: bugman
Date: Mon Jun  4 16:32:28 2012
New Revision: 16636

URL: http://svn.gna.org/viewcvs/relax?rev=16636&view=rev
Log:
Fixes for the test_pipe_bundle() system and GUI test.


Modified:
    branches/uf_redesign/test_suite/system_tests/pipes.py

Modified: branches/uf_redesign/test_suite/system_tests/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/system_tests/pipes.py?rev=16636&r1=16635&r2=16636&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/system_tests/pipes.py (original)
+++ branches/uf_redesign/test_suite/system_tests/pipes.py Mon Jun  4 16:32:28 
2012
@@ -45,13 +45,9 @@
         self.assertEqual(pipes.has_bundle('test bundle 2'), True)
         self.assertEqual(pipes.has_bundle('test bundle 3'), False)
         self.assertEqual(pipes.bundle_names(), ['test bundle 1', 'test 
bundle 2'])
-        pipe_list = []
-        bundle_list = []
-        for pipe in pipes.pipe_loop():
-            pipe_list.append(pipe)
-            bundle_list.append(pipes.get_bundle(pipe))
-        self.assertEqual(pipe_list, ['test pipe 1', 'test pipe 2', 'test 
pipe 3', 'test pipe 4', 'test pipe 5', 'test pipe 6'])
-        self.assertEqual(bundle_list, ['test bundle 1', 'test bundle 1', 
'test bundle 1', 'test bundle 2', 'test bundle 2', 'test bundle 2'])
+        for pipe, name in pipes.pipe_loop(name=True):
+            self.assert_(name in ['test pipe 1', 'test pipe 2', 'test pipe 
3', 'test pipe 4', 'test pipe 5', 'test pipe 6'])
+            self.assert_(pipes.get_bundle(name) in ['test bundle 1', 'test 
bundle 2'])
 
 
     def test_pipe_create(self):