Skip to content

Run plugin suite_finished handler before upload #82

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
andmat900 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Run plugin suite_finished handler before upload #82

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef46fce
Run plugin suite_finished handler before upload
andmat900 Mar 30, 2026
69320f4
Change plugin handler log level to debug
andmat900 Apr 1, 2026
ade9634
Add comment explaining inner try/finally nesting
andmat900 Apr 1, 2026
70437f8
Refactor: extract method to reduce nesting, fix pylint
andmat900 Apr 2, 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
47 changes: 27 additions & 20 deletions src/etos_test_runner/lib/testrunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,30 +245,37 @@ def execute(self): # pylint:disable=too-many-branches,disable=too-many-statemen
description = None
executed = False
test_framework_exit_codes = []
outcome = None
try:
with Workspace(self.log_area) as workspace:
self.logger.info("Start IUT monitoring.")
self.iut_monitoring.start_monitoring()
self.logger.info("Starting test executor.")
result, test_framework_exit_codes = self.run_tests(workspace)
executed = True
self.logger.info("Stop IUT monitoring.")
self.iut_monitoring.stop_monitoring()
except Exception as exception: # pylint:disable=broad-except
result = False
executed = False
description = str(exception)
raise
try:
Copy link
Copy Markdown
Collaborator

@t-persson t-persson Apr 1, 2026

Choose a reason for hiding this comment

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

Why do we need another level of nesting?

Copy link
Copy Markdown
Contributor Author

@andmat900 andmat900 Apr 1, 2026

Choose a reason for hiding this comment

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

The inner try/finally is needed so that on_test_suite_finished and outcome computation run inside the with Workspace block, before Workspace.__exit__ triggers artifact upload.

Without the inner try/finally, if tests raise an exception, the with block would exit immediately (uploading artifacts), and we'd never call the plugin handlers in time. The inner finally guarantees the plugin handlers run even on exception, but still before the workspace context manager cleans up and uploads.

Copy link
Copy Markdown
Collaborator

@t-persson t-persson Apr 2, 2026

Choose a reason for hiding this comment

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

Then I would rather we create a method. I dont like the sight-line with three levels of nesting

Copy link
Copy Markdown
Contributor Author

@andmat900 andmat900 Apr 2, 2026

Choose a reason for hiding this comment

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

Done.

self.logger.info("Start IUT monitoring.")
self.iut_monitoring.start_monitoring()
self.logger.info("Starting test executor.")
result, test_framework_exit_codes = self.run_tests(workspace)
executed = True
self.logger.info("Stop IUT monitoring.")
self.iut_monitoring.stop_monitoring()
except Exception as exception: # pylint:disable=broad-except
result = False
executed = False
description = str(exception)
raise
finally:
if self.iut_monitoring.monitoring:
self.logger.info("Stop IUT monitoring.")
self.iut_monitoring.stop_monitoring()
self.logger.info("Figure out test outcome.")
outcome = self.outcome(result, executed, description, test_framework_exit_codes)
pprint(outcome)
self.logger.info("Call on_test_suite_finished plugin handlers.")
Copy link
Copy Markdown
Collaborator

@t-persson t-persson Apr 1, 2026

Choose a reason for hiding this comment

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

debug

Copy link
Copy Markdown
Contributor Author

@andmat900 andmat900 Apr 1, 2026

Choose a reason for hiding this comment

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

Done

self._test_suite_finished(self.config.get("name"), outcome)
finally:
if self.iut_monitoring.monitoring:
self.logger.info("Stop IUT monitoring.")
self.iut_monitoring.stop_monitoring()
self.logger.info("Figure out test outcome.")
outcome = self.outcome(result, executed, description, test_framework_exit_codes)
pprint(outcome)

if outcome is None:
self.logger.info("Figure out test outcome.")
outcome = self.outcome(result, executed, description, test_framework_exit_codes)
pprint(outcome)
self.logger.info("Send test suite finished event.")
self._test_suite_finished(self.config.get("name"), outcome)
test_suite_finished = self.etos.events.send_test_suite_finished(
test_suite_started,
links={"CONTEXT": self.etos.config.get("context")},
Expand Down
Loading