Merge pull request #265 from ericsnowcurrently/fix-mac-tests

Fix the high-level tests on Mac.
This commit is contained in:
Eric Snow 2018-03-26 17:55:11 -06:00 committed by GitHub
commit a99ce72b9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -87,7 +87,11 @@ class Connection(namedtuple('Connection', 'client server')):
def shutdown(self, *args, **kwargs):
if self.server is not None:
self.server.shutdown(*args, **kwargs)
try:
self.server.shutdown(*args, **kwargs)
except OSError as exc:
if exc.errno not in (errno.ENOTCONN, errno.EBADF):
raise
try:
self.client.shutdown(*args, **kwargs)
except OSError as exc: