Author: bugman Date: Fri May 18 09:10:36 2012 New Revision: 16324 URL: http://svn.gna.org/viewcvs/relax?rev=16324&view=rev Log: Merged revisions 16323 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r16323 | bugman | 2012-05-18 09:09:55 +0200 (Fri, 18 May 2012) | 7 lines 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: branches/uf_redesign/ (props changed) branches/uf_redesign/gui/controller.py Propchange: branches/uf_redesign/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri May 18 09:10:36 2012 @@ -1,1 +1,1 @@ -/1.3:1-16321 +/1.3:1-16323 Modified: branches/uf_redesign/gui/controller.py URL: http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/controller.py?rev=16324&r1=16323&r2=16324&view=diff ============================================================================== --- branches/uf_redesign/gui/controller.py (original) +++ branches/uf_redesign/gui/controller.py Fri May 18 09:10:36 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()