[Python-checkins] python/dist/src/Lib/test test_logging.py, 1.14,
1.15
vsajip at users.sourceforge.net
vsajip at users.sourceforge.net
Wed Aug 4 10:29:16 CEST 2004
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176
Modified Files:
test_logging.py
Log Message:
Close handlers and tidy up loggers by removing closed handlers - to avoid problems when run twice (SF #1002537)
Index: test_logging.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_logging.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_logging.py 2 Jun 2004 10:51:05 -0000 1.14
--- test_logging.py 4 Aug 2004 08:29:14 -0000 1.15
***************
*** 412,416 ****
#receiver (logrecv).
#The handler will only be added to the rootLogger for some of the tests
! hdlr = logging.handlers.SocketHandler('localhost',
logging.handlers.DEFAULT_TCP_LOGGING_PORT)
--- 412,416 ----
#receiver (logrecv).
#The handler will only be added to the rootLogger for some of the tests
! shdlr = logging.handlers.SocketHandler('localhost',
logging.handlers.DEFAULT_TCP_LOGGING_PORT)
***************
*** 438,445 ****
banner("log_test0", "begin")
! rootLogger.addHandler(hdlr)
test0()
! hdlr.close()
! rootLogger.removeHandler(hdlr)
banner("log_test0", "end")
--- 438,445 ----
banner("log_test0", "begin")
! rootLogger.addHandler(shdlr)
test0()
! shdlr.close()
! rootLogger.removeHandler(shdlr)
banner("log_test0", "end")
***************
*** 464,471 ****
banner("logrecv output", "begin")
sys.stdout.write(sockOut.getvalue())
- sockhdlr.close()
sockOut.close()
banner("logrecv output", "end")
sys.stdout.flush()
def test_main():
--- 464,477 ----
banner("logrecv output", "begin")
sys.stdout.write(sockOut.getvalue())
sockOut.close()
+ sockLogger.removeHandler(sockhdlr)
+ sockhdlr.close()
banner("logrecv output", "end")
sys.stdout.flush()
+ try:
+ hdlr.close()
+ except:
+ pass
+ rootLogger.removeHandler(hdlr)
def test_main():
More information about the Python-checkins
mailing list