summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2019-06-26 20:45:07 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2019-06-26 20:45:07 +0200
commit7aea16fd9bd3fbf9a00ae144ebd280903d3b3254 (patch)
treed3d64d3fbf5a7fcaed640f0ab099731cfb115777
parentbf8420af0851c6256a9fca322b07864c93a8f8b9 (diff)
downloadpsutil-7aea16fd9bd3fbf9a00ae144ebd280903d3b3254.tar.gz
use SO_REUSEADDR on UNIX only
-rw-r--r--Makefile1
-rw-r--r--psutil/tests/__init__.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b14978b2..a3763848 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ DEPS = \
ipaddress \
mock==1.0.1 \
perf \
+ readline \
requests \
setuptools \
sphinx \
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index 5e4f37b3..fc52f6ad 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -868,7 +868,6 @@ def skip_on_not_implemented(only_if=None):
def get_free_port(host='127.0.0.1'):
"""Return an unused TCP port."""
with contextlib.closing(socket.socket()) as sock:
- sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind((host, 0))
return sock.getsockname()[1]
@@ -895,7 +894,8 @@ def bind_socket(family=AF_INET, type=SOCK_STREAM, addr=None):
addr = ("", 0)
sock = socket.socket(family, type)
try:
- sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+ if os.name not in ('nt', 'cygwin'):
+ sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind(addr)
if type == socket.SOCK_STREAM:
sock.listen(5)