Skip to content

bpo-40436: Fix code parsing gdb version #19792

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
Apr 29, 2020
Merged

bpo-40436: Fix code parsing gdb version #19792

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
3 changes: 3 additions & 0 deletions Lib/test/pythoninfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,9 @@ def collect_gdb(info_add):
stderr=subprocess.PIPE,
universal_newlines=True)
version = proc.communicate()[0]
if proc.returncode:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider this more readable:

Suggested change
if proc.returncode:
if proc.returncode != 0:

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both syntaxes are equivalent. I prefer `if proc.returncode:" (coding style preference) ;-)

# ignore gdb failure: test_gdb will log the error
return
except OSError:
return

Expand Down
10 changes: 8 additions & 2 deletions Lib/test/test_gdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,18 @@

def get_gdb_version():
try:
proc = subprocess.Popen(["gdb", "-nx", "--version"],
cmd = ["gdb", "-nx", "--version"]
proc = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
universal_newlines=True)
with proc:
version = proc.communicate()[0]
version, stderr = proc.communicate()

if proc.returncode:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider this more readable:

Suggested change
if proc.returncode:
if proc.returncode != 0:

raise Exception(f"Command {' '.join(cmd)!r} failed "
f"with exit code {proc.returncode}: "
f"stdout={version!r} stderr={stderr!r}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test is normally skipped if gdb is not found:

raise unittest.SkipTest("Couldn't find gdb on the path")

Should we not do the same?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test is still skipped when gdb is not found. But the new code is when gdb is available but is broken. I would prefer to not fail silently when gdb is broken, but get an error even if it's a third-party component. It should help to debug Python CIs like buildbots.

It's like the existing test which raises an exception if Python fails to parse the gdb version:

    match = re.search(r"^GNU gdb.*?\b(\d+)\.(\d+)", version)
    if match is None:
        raise Exception("unable to parse GDB version: %r" % version)

except OSError:
# This is what "no gdb" looks like. There may, however, be other
# errors that manifest this way too.
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Tests/2020-04-29-16-08-24.bpo-40436.gDMnYl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test_gdb and test.pythoninfo now check gdb command exit code.