mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-11 17:10:13 +00:00
net: selftests: clean up tools/testing/selftests/net/lib/py/utils.py
This patch improves the utils.py module by removing unused imports (errno, random), simplifying the fd_read_timeout() function by eliminating unnecessary else clause, and cleaning up code style in the defer class constructor. Additionally, it renames the parameter in rand_port() from 'type' to 'stype' to avoid shadowing the built-in Python name 'type', improving code clarity and preventing potential issues. These changes enhance code readability and maintainability without affecting functionality. Signed-off-by: Breno Leitao <leitao@debian.org> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20250901-fix-v1-1-df0abb67481e@debian.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
d250f14f5f
commit
23313771c7
@ -1,9 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
import errno
|
||||
import json as _json
|
||||
import os
|
||||
import random
|
||||
import re
|
||||
import select
|
||||
import socket
|
||||
@ -21,8 +19,7 @@ def fd_read_timeout(fd, timeout):
|
||||
rlist, _, _ = select.select([fd], [], [], timeout)
|
||||
if rlist:
|
||||
return os.read(fd, 1024)
|
||||
else:
|
||||
raise TimeoutError("Timeout waiting for fd read")
|
||||
raise TimeoutError("Timeout waiting for fd read")
|
||||
|
||||
|
||||
class cmd:
|
||||
@ -138,8 +135,6 @@ global_defer_queue = []
|
||||
|
||||
class defer:
|
||||
def __init__(self, func, *args, **kwargs):
|
||||
global global_defer_queue
|
||||
|
||||
if not callable(func):
|
||||
raise Exception("defer created with un-callable object, did you call the function instead of passing its name?")
|
||||
|
||||
@ -227,11 +222,11 @@ def bpftrace(expr, json=None, ns=None, host=None, timeout=None):
|
||||
return cmd_obj
|
||||
|
||||
|
||||
def rand_port(type=socket.SOCK_STREAM):
|
||||
def rand_port(stype=socket.SOCK_STREAM):
|
||||
"""
|
||||
Get a random unprivileged port.
|
||||
"""
|
||||
with socket.socket(socket.AF_INET6, type) as s:
|
||||
with socket.socket(socket.AF_INET6, stype) as s:
|
||||
s.bind(("", 0))
|
||||
return s.getsockname()[1]
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user