Changeset e4335ae in sasview for src/sas/qtgui/Utilities/UnitTesting

Timestamp:

Jul 19, 2018 6:12:03 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c0de493

Parents:

02e7d3a

git-author:

Torin Cooper-Bennun <40573959+tcbennun@…> (07/19/18 06:12:03)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (07/19/18 06:12:03)

Message:

SASVIEW-957 logging changes (#158)

• rework XStream to continue to write to stdout/stderr alongside redirection; make logging level setting consistent; make log configuration more consistent

• rm XStream; QT signal in QtHandler? logging handler; only logs in Log Explorer (no stdout/stderr)

• no need to change handler level

• use QTextBrowser.append to facilitate auto-scrolling in the Log Explorer

• modify logger unit test to reflect changes (passes)

File:

• src/sas/qtgui/Utilities/UnitTesting/SasviewLoggerTest.py (modified) (5 diffs)

src/sas/qtgui/Utilities/UnitTesting/SasviewLoggerTest.py

@@ -11 +11 @@
 
 # Local
-from sas.qtgui.Utilities.SasviewLogger import XStream
 from sas.qtgui.Utilities.SasviewLogger import QtHandler
 
@@ -23 +22 @@
         """
         self.logger = logging.getLogger(__name__)
-        handler = QtHandler()
-        handler.setFormatter(logging.Formatter("%(levelname)s: %(message)s"))
-        self.logger.addHandler(handler)
+        self.handler = QtHandler()
+        self.handler.setFormatter(logging.Formatter("%(levelname)s: %(message)s"))
+        self.logger.addHandler(self.handler)
         self.logger.setLevel(logging.DEBUG)
 
@@ -35 +34 @@
         Test redirection of all levels of logging
         """
-        # Attach the listeners
-        XStream.stderr().messageWritten.connect( self.outHandlerGui.insertPlainText )
-        XStream.stdout().messageWritten.connect( self.outHandlerGui.insertPlainText )
+        # Attach the listener
+        self.handler.messageWritten.connect(self.outHandlerGui.insertPlainText)
 
         # Send the signals
@@ -44 +42 @@
         self.logger.warning('warning message')
         self.logger.error('error message')
-        sys.stdout.write('with stdout')
-        sys.stderr.write('with stderr')
 
         out=self.outHandlerGui.toPlainText()
@@ -54 +50 @@
         self.assertIn('WARNING: warning message', out)
         self.assertIn('ERROR: error message', out)
-        self.assertIn('with stdout', out)
-        self.assertIn('with stderr', out)
 
 if __name__ == "__main__":