Skip to content

fix(tests): keep the test suite and compdb frontend working on Python 3.15 #41

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

Closed
Frauschi wants to merge 2 commits into from
Closed

fix(tests): keep the test suite and compdb frontend working on Python 3.15 #41

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
e111300
fix(tests): load modules with exec_module in test_low_findings
Frauschi Oct 19, 2026
1e88ea0
fix(compdb): pass maxsplit to re.split by keyword
Frauschi Oct 19, 2026
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
2 changes: 1 addition & 1 deletion share/frontends/compdb_sbom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def entry_tokens(entry):
def macro_name(d):
"""Macro name of a -D/-U operand: the text before the first '=' or '(',
so a function-like 'F(a)=a' is keyed as 'F'."""
return re.split(r'[=(]', d, 1)[0]
return re.split(r'[=(]', d, maxsplit=1)[0]


def extract_defines(tokens):
Expand Down
28 changes: 19 additions & 9 deletions tests/test_low_findings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
"""Regression tests for the low-severity review-findings bundle (gpex.20)."""

import importlib.util
import json
import os
import stat
Expand All @@ -15,12 +16,19 @@
GEN_SBOM = os.path.join(SHARE, "gen-sbom")
VALIDATE = os.path.join(SHARE, "validate_sbom.py")

gs = SourceFileLoader("gen_sbom", GEN_SBOM).load_module()
drv = SourceFileLoader("sbom_driver", os.path.join(SHARE, "sbom-driver.py")
).load_module()
compdb = SourceFileLoader(
"compdb_sbom", os.path.join(SHARE, "frontends", "compdb_sbom.py")
).load_module()

def _load(name, path):
loader = SourceFileLoader(name, path)
module = importlib.util.module_from_spec(
importlib.util.spec_from_loader(name, loader))
loader.exec_module(module)
return module


gs = _load("gen_sbom", GEN_SBOM)
drv = _load("sbom_driver", os.path.join(SHARE, "sbom-driver.py"))
compdb = _load("compdb_sbom",
os.path.join(SHARE, "frontends", "compdb_sbom.py"))


class TestAtomicWrite(unittest.TestCase):
Expand All @@ -35,9 +43,11 @@ def test_writes_content_and_leaves_no_temp(self):
def test_dev_stdout_redirected_to_file(self):
# `--cdx-out /dev/stdout > out.json`: /dev/stdout is a symlink to the
# redirected file and must be written through, not replaced.
code = ("from importlib.machinery import SourceFileLoader as L; "
"L('g', %r).load_module().write_json_atomic({'a': 1}, "
"'/dev/stdout')" % GEN_SBOM)
code = ("import importlib.util as u; "
"from importlib.machinery import SourceFileLoader as L; "
"l = L('g', %r); m = u.module_from_spec("
"u.spec_from_loader('g', l)); l.exec_module(m); "
"m.write_json_atomic({'a': 1}, '/dev/stdout')" % GEN_SBOM)
with tempfile.TemporaryDirectory() as d:
out = os.path.join(d, "out.json")
with open(out, "w") as f:
Expand Down
Loading