Skip to content

Improve test output regexes for better perf and Go 1.20 support #1220

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
reglim merged 3 commits into from
Oct 3, 2023
Merged

Improve test output regexes for better perf and Go 1.20 support #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d44fa3
Improve test output regex for better perf
refi64 Sep 7, 2023
dbc5a68
Fix the test output regex on Go 1.20
refi64 Sep 7, 2023
88f1409
Add myself to authors
refi64 Sep 22, 2023
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 AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ List of contributors, in chronological order:
* Mauro Regli (https://github.com/reglim)
* Alexander Zubarev (https://github.com/strike)
* Nicolas Dostert (https://github.com/acdn-ndostert)
* Ryan Gonzalez (https://github.com/refi64)
11 changes: 4 additions & 7 deletions system/lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,15 +296,12 @@ def run_cmd(self, command, expected_code=0):
if is_aptly_command:
# remove the last two rows as go tests always print PASS/FAIL and coverage in those
# two lines. This would otherwise fail the tests as they would not match gold
matches = re.findall(r"((.|\n)*)EXIT: (\d)\n.*\ncoverage: .*", raw_output.decode("utf-8"))
if not matches:
match = re.search(r"EXIT: (\d)\n.*\n.*coverage: .*", raw_output.decode("utf-8"))
if match is None:
raise Exception("no matches found in output '%s'" % raw_output.decode("utf-8"))

output, _, returncode = matches[0]

output = output.encode()
returncodes.append(int(returncode))

output = match.string[:match.start()].encode()
returncodes.append(int(match.group(1)))
else:
output = raw_output

Expand Down