Skip to content

Use gethostname instead of potentially slow getfqdn #2380

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

Merged
merged 1 commit into from
Mar 18, 2022
Merged

Use gethostname instead of potentially slow getfqdn #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions docs/changelog/2375.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Avoid potential 30s delay caused by socket.getfqdn(). -- by :user:`ssbarnea`
2 changes: 1 addition & 1 deletion src/tox/logs/result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def __init__(self):
"reportversion": "1",
"toxversion": __version__,
"platform": sys.platform,
"host": os.getenv(str("HOSTNAME")) or socket.getfqdn(),
"host": os.getenv(str("HOSTNAME")) or socket.gethostname(),
"commands": command_log,
}

Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def test_pre_set_header(clean_hostname_envvar):
assert replog.dict["reportversion"] == "1"
assert replog.dict["toxversion"] == tox.__version__
assert replog.dict["platform"] == sys.platform
assert replog.dict["host"] == socket.getfqdn()
assert replog.dict["host"] == socket.gethostname()
data = replog.dumps_json()
replog2 = ResultLog.from_json(data)
assert replog2.dict == replog.dict
Expand All @@ -44,7 +44,7 @@ def test_set_header(pkg, clean_hostname_envvar):
assert replog.dict["reportversion"] == "1"
assert replog.dict["toxversion"] == tox.__version__
assert replog.dict["platform"] == sys.platform
assert replog.dict["host"] == socket.getfqdn()
assert replog.dict["host"] == socket.gethostname()
expected = {"basename": "hello-1.0.tar.gz", "sha256": pkg.computehash("sha256")}
env_log = replog.get_envlog("a")
env_log.set_header(installpkg=pkg)
Expand Down