Commit 5b1e003d authored by Martin v. Löwis's avatar Martin v. Löwis

Try a number of ports, in case 9020 is already in use.

parent f684888b
...@@ -565,11 +565,23 @@ def test_main_inner(): ...@@ -565,11 +565,23 @@ def test_main_inner():
hdlr.setFormatter(fmt) hdlr.setFormatter(fmt)
rootLogger.addHandler(hdlr) rootLogger.addHandler(hdlr)
# Find an unused port number
port = logging.handlers.DEFAULT_TCP_LOGGING_PORT
while port < logging.handlers.DEFAULT_TCP_LOGGING_PORT+100:
try:
tcpserver = LogRecordSocketReceiver(port=port)
except socket.error:
port += 1
else:
break
else:
raise ImportError, "Could not find unused port"
#Set up a handler such that all events are sent via a socket to the log #Set up a handler such that all events are sent via a socket to the log
#receiver (logrecv). #receiver (logrecv).
#The handler will only be added to the rootLogger for some of the tests #The handler will only be added to the rootLogger for some of the tests
shdlr = logging.handlers.SocketHandler('localhost', shdlr = logging.handlers.SocketHandler('localhost', port)
logging.handlers.DEFAULT_TCP_LOGGING_PORT)
#Configure the logger for logrecv so events do not propagate beyond it. #Configure the logger for logrecv so events do not propagate beyond it.
#The sockLogger output is buffered in memory until the end of the test, #The sockLogger output is buffered in memory until the end of the test,
...@@ -585,7 +597,6 @@ def test_main_inner(): ...@@ -585,7 +597,6 @@ def test_main_inner():
#Set up servers #Set up servers
threads = [] threads = []
tcpserver = LogRecordSocketReceiver()
#sys.stdout.write("About to start TCP server...\n") #sys.stdout.write("About to start TCP server...\n")
threads.append(threading.Thread(target=runTCP, args=(tcpserver,))) threads.append(threading.Thread(target=runTCP, args=(tcpserver,)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment