Skip to content

bpo-28684: asyncio tests now handle PermissionError raised when bindi… #4503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xdegaye merged 6 commits into from
Nov 24, 2017
Merged

bpo-28684: asyncio tests now handle PermissionError raised when bindi… #4503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37e6b45
bpo-28684: asyncio tests now handle PermissionError raised when bindi…
xdegaye Nov 22, 2017
b5073f5
Use instead a new skip_unless_bind_unix_socket() decorator
xdegaye Nov 24, 2017
e376db6
Merge remote-tracking branch 'origin/master' into bpo-28684
xdegaye Nov 24, 2017
62e26d4
The decorator must be applied last
xdegaye Nov 24, 2017
b58c5ab
Only one decorator is needed
xdegaye Nov 24, 2017
4c3a224
Set _bind_nix_socket_error to False when no error
xdegaye Nov 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
"requires_IEEE_754", "skip_unless_xattr", "requires_zlib",
"anticipate_failure", "load_package_tests", "detect_api_mismatch",
"check__all__", "requires_android_level", "requires_multiprocessing_queue",
"skip_unless_bind_unix_socket",
# sys
"is_jython", "is_android", "check_impl_detail", "unix_shell",
"setswitchinterval",
Expand Down Expand Up @@ -2432,6 +2433,28 @@ def skip_unless_xattr(test):
msg = "no non-broken extended attribute support"
return test if ok else unittest.skip(msg)(test)

_bind_nix_socket_error = None
def skip_unless_bind_unix_socket(test):
"""Decorator for tests requiring a functional bind() for unix sockets."""
if not hasattr(socket, 'AF_UNIX'):
return unittest.skip('No UNIX Sockets')(test)
global _bind_nix_socket_error
if _bind_nix_socket_error is None:
path = TESTFN + "can_bind_unix_socket"
with socket.socket(socket.AF_UNIX) as sock:
try:
sock.bind(path)
_bind_nix_socket_error = False
except OSError as e:
_bind_nix_socket_error = e
finally:
unlink(path)
if _bind_nix_socket_error:
msg = 'Requires a functional unix bind(): %s' % _bind_nix_socket_error
return unittest.skip(msg)(test)
else:
return test


def fs_is_case_insensitive(directory):
"""Detects if the file system for the specified directory is case-insensitive."""
Expand Down
15 changes: 8 additions & 7 deletions Lib/test/test_asyncio/test_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import unittest
from unittest import mock
import weakref
from test import support

if sys.platform != 'win32':
import tty
Expand Down Expand Up @@ -470,7 +471,7 @@ def test_sock_client_ops(self):
sock = socket.socket()
self._basetest_sock_recv_into(httpd, sock)

@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
@support.skip_unless_bind_unix_socket
def test_unix_sock_client_ops(self):
with test_utils.run_test_unix_server() as httpd:
sock = socket.socket(socket.AF_UNIX)
Expand Down Expand Up @@ -606,7 +607,7 @@ def test_create_connection(self):
lambda: MyProto(loop=self.loop), *httpd.address)
self._basetest_create_connection(conn_fut)

@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
@support.skip_unless_bind_unix_socket
def test_create_unix_connection(self):
# Issue #20682: On Mac OS X Tiger, getsockname() returns a
# zero-length address for UNIX socket.
Expand Down Expand Up @@ -736,8 +737,8 @@ def test_create_ssl_connection(self):
self._test_create_ssl_connection(httpd, create_connection,
peername=httpd.address)

@support.skip_unless_bind_unix_socket
@unittest.skipIf(ssl is None, 'No ssl module')
@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
def test_create_ssl_unix_connection(self):
# Issue #20682: On Mac OS X Tiger, getsockname() returns a
# zero-length address for UNIX socket.
Expand Down Expand Up @@ -961,7 +962,7 @@ def _make_unix_server(self, factory, **kwargs):

return server, path

@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
@support.skip_unless_bind_unix_socket
def test_create_unix_server(self):
proto = MyProto(loop=self.loop)
server, path = self._make_unix_server(lambda: proto)
Expand Down Expand Up @@ -1053,8 +1054,8 @@ def test_create_server_ssl(self):
# stop serving
server.close()

@support.skip_unless_bind_unix_socket
@unittest.skipIf(ssl is None, 'No ssl module')
@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
def test_create_unix_server_ssl(self):
proto = MyProto(loop=self.loop)
server, path = self._make_ssl_unix_server(
Expand Down Expand Up @@ -1113,8 +1114,8 @@ def test_create_server_ssl_verify_failed(self):
self.assertIsNone(proto.transport)
server.close()

@support.skip_unless_bind_unix_socket
@unittest.skipIf(ssl is None, 'No ssl module')
@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
def test_create_unix_server_ssl_verify_failed(self):
proto = MyProto(loop=self.loop)
server, path = self._make_ssl_unix_server(
Expand Down Expand Up @@ -1171,8 +1172,8 @@ def test_create_server_ssl_match_failed(self):
proto.transport.close()
server.close()

@support.skip_unless_bind_unix_socket
@unittest.skipIf(ssl is None, 'No ssl module')
@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
def test_create_unix_server_ssl_verified(self):
proto = MyProto(loop=self.loop)
server, path = self._make_ssl_unix_server(
Expand Down
9 changes: 5 additions & 4 deletions Lib/test/test_asyncio/test_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import threading
import unittest
from unittest import mock
from test import support
try:
import ssl
except ImportError:
Expand Down Expand Up @@ -57,7 +58,7 @@ def test_open_connection(self):
loop=self.loop)
self._basetest_open_connection(conn_fut)

@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
@support.skip_unless_bind_unix_socket
def test_open_unix_connection(self):
with test_utils.run_test_unix_server() as httpd:
conn_fut = asyncio.open_unix_connection(httpd.address,
Expand Down Expand Up @@ -86,8 +87,8 @@ def test_open_connection_no_loop_ssl(self):

self._basetest_open_connection_no_loop_ssl(conn_fut)

@support.skip_unless_bind_unix_socket
@unittest.skipIf(ssl is None, 'No ssl module')
@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
def test_open_unix_connection_no_loop_ssl(self):
with test_utils.run_test_unix_server(use_ssl=True) as httpd:
conn_fut = asyncio.open_unix_connection(
Expand All @@ -113,7 +114,7 @@ def test_open_connection_error(self):
loop=self.loop)
self._basetest_open_connection_error(conn_fut)

@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
@support.skip_unless_bind_unix_socket
def test_open_unix_connection_error(self):
with test_utils.run_test_unix_server() as httpd:
conn_fut = asyncio.open_unix_connection(httpd.address,
Expand Down Expand Up @@ -634,7 +635,7 @@ def client(addr):
server.stop()
self.assertEqual(msg, b"hello world!\n")

@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
@support.skip_unless_bind_unix_socket
def test_start_unix_server(self):

class MyServer:
Expand Down
4 changes: 4 additions & 0 deletions Lib/test/test_asyncio/test_unix_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import threading
import unittest
from unittest import mock
from test import support

if sys.platform == 'win32':
raise unittest.SkipTest('UNIX only')
Expand Down Expand Up @@ -239,6 +240,7 @@ def setUp(self):
self.loop = asyncio.SelectorEventLoop()
self.set_event_loop(self.loop)

@support.skip_unless_bind_unix_socket
def test_create_unix_server_existing_path_sock(self):
with test_utils.unix_socket_path() as path:
sock = socket.socket(socket.AF_UNIX)
Expand All @@ -251,6 +253,7 @@ def test_create_unix_server_existing_path_sock(self):
srv.close()
self.loop.run_until_complete(srv.wait_closed())

@support.skip_unless_bind_unix_socket
def test_create_unix_server_pathlib(self):
with test_utils.unix_socket_path() as path:
path = pathlib.Path(path)
Expand Down Expand Up @@ -308,6 +311,7 @@ def test_create_unix_server_path_dgram(self):

@unittest.skipUnless(hasattr(socket, 'SOCK_NONBLOCK'),
'no socket.SOCK_NONBLOCK (linux only)')
@support.skip_unless_bind_unix_socket
def test_create_unix_server_path_stream_bittype(self):
sock = socket.socket(
socket.AF_UNIX, socket.SOCK_STREAM | socket.SOCK_NONBLOCK)
Expand Down
5 changes: 5 additions & 0 deletions Misc/NEWS.d/next/Library/2017-11-22-12-54-46.bpo-28684.NLiDKZ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The new test.support.skip_unless_bind_unix_socket() decorator is used here to
skip asyncio tests that fail because the platform lacks a functional bind()
function for unix domain sockets (as it is the case for non root users on the
recent Android versions that run now SELinux in enforcing mode).