[Python-checkins] bpo-36341: Fix tests calling bind() on AF_UNIX sockets (GH-12399)
Miss Islington (bot)
webhook-mailer at python.org
Fri May 3 11:09:21 EDT 2019
https://github.com/python/cpython/commit/4461d704e23a13dfbe78ea3020e4cbeff4b68dc2
commit: 4461d704e23a13dfbe78ea3020e4cbeff4b68dc2
branch: master
author: xdegaye <xdegaye at gmail.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-05-03T08:09:17-07:00
summary:
bpo-36341: Fix tests calling bind() on AF_UNIX sockets (GH-12399)
Those tests may fail with PermissionError.
https://bugs.python.org/issue36341
files:
A Misc/NEWS.d/next/Tests/2019-03-18-10-47-45.bpo-36341.UXlY0P.rst
M Lib/test/test_asyncio/test_server.py
M Lib/test/test_socket.py
M Lib/test/test_stat.py
diff --git a/Lib/test/test_asyncio/test_server.py b/Lib/test/test_asyncio/test_server.py
index 6de058a1e9bf..ab7f3debbc15 100644
--- a/Lib/test/test_asyncio/test_server.py
+++ b/Lib/test/test_asyncio/test_server.py
@@ -73,7 +73,7 @@ class SelectorStartServerTests(BaseStartServer, unittest.TestCase):
def new_loop(self):
return asyncio.SelectorEventLoop()
- @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'no Unix sockets')
+ @support.skip_unless_bind_unix_socket
def test_start_unix_server_1(self):
HELLO_MSG = b'1' * 1024 * 5 + b'\n'
started = threading.Event()
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 815f9adce677..0094cecb79cc 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1796,8 +1796,13 @@ def test_socket_fileno(self):
self.addCleanup(shutil.rmtree, tmpdir)
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.addCleanup(s.close)
- s.bind(os.path.join(tmpdir, 'socket'))
- self._test_socket_fileno(s, socket.AF_UNIX, socket.SOCK_STREAM)
+ try:
+ s.bind(os.path.join(tmpdir, 'socket'))
+ except PermissionError:
+ pass
+ else:
+ self._test_socket_fileno(s, socket.AF_UNIX,
+ socket.SOCK_STREAM)
def test_socket_fileno_rejects_float(self):
with self.assertRaisesRegex(TypeError, "integer argument expected"):
diff --git a/Lib/test/test_stat.py b/Lib/test/test_stat.py
index 38ff2bcf8a6b..17443bed0738 100644
--- a/Lib/test/test_stat.py
+++ b/Lib/test/test_stat.py
@@ -2,7 +2,8 @@
import os
import socket
import sys
-from test.support import TESTFN, import_fresh_module
+from test.support import (TESTFN, import_fresh_module,
+ skip_unless_bind_unix_socket)
c_stat = import_fresh_module('stat', fresh=['_stat'])
py_stat = import_fresh_module('stat', blocked=['_stat'])
@@ -192,7 +193,7 @@ def test_devices(self):
self.assertS_IS("BLK", st_mode)
break
- @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'requires unix socket')
+ @skip_unless_bind_unix_socket
def test_socket(self):
with socket.socket(socket.AF_UNIX) as s:
s.bind(TESTFN)
diff --git a/Misc/NEWS.d/next/Tests/2019-03-18-10-47-45.bpo-36341.UXlY0P.rst b/Misc/NEWS.d/next/Tests/2019-03-18-10-47-45.bpo-36341.UXlY0P.rst
new file mode 100644
index 000000000000..b76447d6cf97
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-03-18-10-47-45.bpo-36341.UXlY0P.rst
@@ -0,0 +1,2 @@
+Fix tests that may fail with PermissionError upon calling bind() on AF_UNIX
+sockets.
More information about the Python-checkins
mailing list