r16323 - /1.3/gui/controller.py -- May 18, 2012 - 09:09

Author: bugman
Date: Fri May 18 09:09:55 2012
New Revision: 16323

URL: http://svn.gna.org/viewcvs/relax?rev=16323&view=rev
Log:
Fix for the relax controller SplitIO() setup for logging and teeing modes.

The SplitIO() usage is now disabled for the test suite.  This prevents a 
doubling of the print outs
in the GUI tests.  The problem was introduced at r15843 with the 
accommodation for the logging and
teeing modes with the GUI.


Modified:
    1.3/gui/controller.py

Modified: 1.3/gui/controller.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/controller.py?rev=16323&r1=16322&r2=16323&view=diff
==============================================================================
--- 1.3/gui/controller.py (original)
+++ 1.3/gui/controller.py Fri May 18 09:09:55 2012
@@ -99,7 +99,7 @@
 
         # IO redirection for STDOUT (with splitting if logging or teeing 
modes are set).
         out = Redirect_text(self.log_panel, self.log_queue, 
orig_io=sys.stdout, stream=0)
-        if sys.stdout == sys.__stdout__:
+        if sys.stdout == sys.__stdout__ or status.relax_mode in ['test 
suite', 'system tests', 'unit tests', 'GUI tests']:
             sys.stdout = out
         else:
             split_stdout = SplitIO()
@@ -108,7 +108,7 @@
 
         # IO redirection for STDERR (with splitting if logging or teeing 
modes are set).
         err = Redirect_text(self.log_panel, self.log_queue, 
orig_io=sys.stderr, stream=1)
-        if sys.stderr == sys.__stderr__:
+        if sys.stderr == sys.__stderr__ or status.relax_mode in ['test 
suite', 'system tests', 'unit tests', 'GUI tests']:
             sys.stderr = err
         else:
             split_stderr = SplitIO()