Skip to content

Fix false positive linter warning and a use before assignment #803

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix false positive linter warning and a use before assignment #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e384c2
Prevent false positive linter warning in BSDSocket._iter_sockets()
CarstenGrohmann Apr 1, 2025
9acf605
Prevent use before assigment in host fixture
CarstenGrohmann Apr 4, 2025
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
9 changes: 5 additions & 4 deletions test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ def host(request, tmpdir_factory):
fname = f"_docker_container_{spec.name}_{scope}"
docker_id, docker_host, port = request.getfixturevalue(fname)

hostname = None
if kw["connection"] == "docker":
hostname = docker_id
elif kw["connection"] in ("ansible", "ssh", "paramiko", "safe-ssh"):
Expand All @@ -154,7 +155,7 @@ def host(request, tmpdir_factory):
key = tmpdir.join("ssh_key")
with open(os.path.join(BASETESTDIR, "ssh_key")) as f:
key.write(f.read())
key.chmod(384) # octal 600
key.chmod(0o600)
if kw["connection"] == "ansible":
setup_ansible_config(
tmpdir, hostname, docker_host, spec.user or "root", port, str(key)
Expand Down Expand Up @@ -184,10 +185,10 @@ def host(request, tmpdir_factory):
while not service(service_name).is_running:
time.sleep(0.5)

if kw["connection"] != "ansible":
hostspec = (spec.user or "root") + "@" + hostname
else:
if kw["connection"] == "ansible":
hostspec = spec.name
else:
hostspec = f"{spec.user or 'root'}@{hostname or spec.name}"

b = testinfra.host.get_host(hostspec, **kw)
b.backend.get_hostname = lambda: image
Expand Down
7 changes: 2 additions & 5 deletions testinfra/modules/socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def _iter_sockets(self, listening):
splitted = line.split()
# FreeBSD: tcp4/tcp6
# OpeNBSD/NetBSD: tcp/tcp6
if splitted[0] in ("tcp", "udp", "udp4", "tcp4", "tcp6", "udp6"):
if splitted[0] in ("tcp", "tcp4", "tcp6", "udp", "udp4", "udp6"):
address = splitted[3]
if address == "*.*":
# On OpenBSD 6.3 (issue #338)
Expand All @@ -337,10 +337,7 @@ def _iter_sockets(self, listening):

if host == "*":
host = "::" if splitted[0] in ("udp6", "tcp6") else "0.0.0.0"
if splitted[0] in ("udp", "udp6", "udp4"):
protocol = "udp"
elif splitted[0] in ("tcp", "tcp6", "tcp4"):
protocol = "tcp"
protocol = "udp" if splitted[0] in ("udp", "udp6", "udp4") else "tcp"

remote = splitted[4]
if remote == "*.*" and listening:
Expand Down