1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make test_fcntl quiet (#108758)

Browse Source 
Running test_fcntl logs two "struct.pack: ..." lines because
multiprocessing imports test_fcntl twice with
test.support.verbose=1. Move get_lockdata() inside TestFcntl test
case and only call it where it's needed, to stop logging these lines.
This commit is contained in:
Victor Stinner 2023-09-01 14:59:09 +02:00 committed by GitHub
parent 3047f09490
commit 23f54c1200
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Lib/test/test_fcntl.py
View File

@ -16,37 +16,6 @@ fcntl = import_module('fcntl')
def get_lockdata():
try:
os.O_LARGEFILE
except AttributeError:
start_len = "ll"
else:
start_len = "qq"
if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd'))
or sys.platform == 'darwin'):
if struct.calcsize('l') == 8:
off_t = 'l'
pid_t = 'i'
else:
off_t = 'lxxxx'
pid_t = 'l'
lockdata = struct.pack(off_t + off_t + pid_t + 'hh', 0, 0, 0,
fcntl.F_WRLCK, 0)
elif sys.platform.startswith('gnukfreebsd'):
lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0)
elif sys.platform in ['hp-uxB', 'unixware7']:
lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
else:
lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0)
if lockdata:
if verbose:
print('struct.pack: ', repr(lockdata))
return lockdata
lockdata = get_lockdata()
class BadFile: class BadFile:
def __init__(self, fn): def __init__(self, fn):
self.fn = fn self.fn = fn
@ -78,12 +47,43 @@ class TestFcntl(unittest.TestCase):
self.f.close() self.f.close()
unlink(TESTFN) unlink(TESTFN)
@staticmethod
def get_lockdata():
try:
os.O_LARGEFILE
except AttributeError:
start_len = "ll"
else:
start_len = "qq"
if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd'))
or sys.platform == 'darwin'):
if struct.calcsize('l') == 8:
off_t = 'l'
pid_t = 'i'
else:
off_t = 'lxxxx'
pid_t = 'l'
lockdata = struct.pack(off_t + off_t + pid_t + 'hh', 0, 0, 0,
fcntl.F_WRLCK, 0)
elif sys.platform.startswith('gnukfreebsd'):
lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0)
elif sys.platform in ['hp-uxB', 'unixware7']:
lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
else:
lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0)
if lockdata:
if verbose:
print('struct.pack: ', repr(lockdata))
return lockdata
def test_fcntl_fileno(self): def test_fcntl_fileno(self):
# the example from the library docs # the example from the library docs
self.f = open(TESTFN, 'wb') self.f = open(TESTFN, 'wb')
rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
if verbose: if verbose:
print('Status from fcntl with O_NONBLOCK: ', rv) print('Status from fcntl with O_NONBLOCK: ', rv)
lockdata = self.get_lockdata()
rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETLKW, lockdata) rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETLKW, lockdata)
if verbose: if verbose:
print('String from fcntl with F_SETLKW: ', repr(rv)) print('String from fcntl with F_SETLKW: ', repr(rv))
@ -95,6 +95,7 @@ class TestFcntl(unittest.TestCase):
rv = fcntl.fcntl(self.f, fcntl.F_SETFL, os.O_NONBLOCK) rv = fcntl.fcntl(self.f, fcntl.F_SETFL, os.O_NONBLOCK)
if verbose: if verbose:
print('Status from fcntl with O_NONBLOCK: ', rv) print('Status from fcntl with O_NONBLOCK: ', rv)
lockdata = self.get_lockdata()
rv = fcntl.fcntl(self.f, fcntl.F_SETLKW, lockdata) rv = fcntl.fcntl(self.f, fcntl.F_SETLKW, lockdata)
if verbose: if verbose:
print('String from fcntl with F_SETLKW: ', repr(rv)) print('String from fcntl with F_SETLKW: ', repr(rv))