Skip to content

Commit c713dc7

Browse files
committed
test: issue2551366. fix probe for open port in test_liveserver.py
Corrected the method. It was missing the outer loop. Updated upstream.
1 parent 4623117 commit c713dc7

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

test/wsgi_liveserver.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import socket
1414
import threading
1515
import unittest
16-
from wsgiref.simple_server import make_server, WSGIRequestHandler
16+
from wsgiref.simple_server import WSGIRequestHandler, make_server
1717

1818
__author__ = 'John Kristensen'
1919
__version__ = '0.3.1'
@@ -23,6 +23,7 @@
2323
Classmethod probe_ports() added by John Rouillard 2024.
2424
"""
2525

26+
2627
class QuietHandler(WSGIRequestHandler):
2728
def log_request(*args, **kwargs):
2829
pass
@@ -89,17 +90,21 @@ def _post_teardown(self):
8990

9091
@classmethod
9192
def probe_ports(cls, start=port_range[0], end=port_range[1]):
92-
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
93-
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
93+
9494
port = start
95-
try:
96-
s.connect(('127.0.0.1', port))
97-
except socket.error as e:
98-
if not hasattr(e, 'args') or e.args[0] != errno.ECONNREFUSED:
99-
raise
100-
return port
101-
else:
102-
s.close()
103-
port += 1
104-
if port > end:
105-
return None
95+
96+
while port <= end:
97+
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
98+
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
99+
100+
try:
101+
s.connect(('127.0.0.1', port))
102+
except socket.error as e:
103+
if not hasattr(e, 'args') or e.args[0] != errno.ECONNREFUSED:
104+
raise
105+
return port
106+
else:
107+
s.close()
108+
port += 1
109+
110+
return None

0 commit comments

Comments
 (0)