Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-36341: Fix tests calling bind() on AF_UNIX sockets (GH-12399) 

Those tests may fail with PermissionError.



https://bugs.python.org/issue36341
This commit is contained in:
xdegaye 2019-05-03 17:09:17 +02:00 committed by Miss Islington (bot)
parent a8a79cacca
commit 4461d704e2
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_asyncio/test_server.py
View File

@ -73,7 +73,7 @@ class SelectorStartServerTests(BaseStartServer, unittest.TestCase):
def new_loop(self): def new_loop(self):
return asyncio.SelectorEventLoop() 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): def test_start_unix_server_1(self):
HELLO_MSG = b'1' * 1024 * 5 + b'\n' HELLO_MSG = b'1' * 1024 * 5 + b'\n'
started = threading.Event() started = threading.Event()

9
Lib/test/test_socket.py
View File

@ -1796,8 +1796,13 @@ class GeneralModuleTests(unittest.TestCase):
self.addCleanup(shutil.rmtree, tmpdir) self.addCleanup(shutil.rmtree, tmpdir)
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.addCleanup(s.close) self.addCleanup(s.close)
s.bind(os.path.join(tmpdir, 'socket')) try:
self._test_socket_fileno(s, socket.AF_UNIX, socket.SOCK_STREAM) 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): def test_socket_fileno_rejects_float(self):
with self.assertRaisesRegex(TypeError, "integer argument expected"): with self.assertRaisesRegex(TypeError, "integer argument expected"):

5
Lib/test/test_stat.py
View File

@ -2,7 +2,8 @@ import unittest
import os import os
import socket import socket
import sys 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']) c_stat = import_fresh_module('stat', fresh=['_stat'])
py_stat = import_fresh_module('stat', blocked=['_stat']) py_stat = import_fresh_module('stat', blocked=['_stat'])
@ -192,7 +193,7 @@ class TestFilemode:
self.assertS_IS("BLK", st_mode) self.assertS_IS("BLK", st_mode)
break break
@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'requires unix socket') @skip_unless_bind_unix_socket
def test_socket(self): def test_socket(self):
with socket.socket(socket.AF_UNIX) as s: with socket.socket(socket.AF_UNIX) as s:
s.bind(TESTFN) s.bind(TESTFN)

2
Misc/NEWS.d/next/Tests/2019-03-18-10-47-45.bpo-36341.UXlY0P.rst Normal file
View File

@ -0,0 +1,2 @@
Fix tests that may fail with PermissionError upon calling bind() on AF_UNIX
sockets.