close
Skip to content

test: set SCENARIO_BARE_CHARM_ERRORS=true in Ops tests that care#2314

Merged
dimaqq merged 3 commits intocanonical:mainfrom
dimaqq:test-annotate-base-charm-errors
Feb 18, 2026
Merged

test: set SCENARIO_BARE_CHARM_ERRORS=true in Ops tests that care#2314
dimaqq merged 3 commits intocanonical:mainfrom
dimaqq:test-annotate-base-charm-errors

Conversation

@dimaqq
Copy link
Copy Markdown
Contributor

@dimaqq dimaqq commented Feb 9, 2026

Fixes #2298 using option 1

@dimaqq dimaqq marked this pull request as ready for review February 9, 2026 07:58
@dimaqq dimaqq changed the title test: mark up Ops own tests that must have SCENARIO_BARE_CHARM_ERRORS=false test: explicitly set SCENARIO_BARE_CHARM_ERRORS=false in Ops own tests that need it Feb 9, 2026
Copy link
Copy Markdown
Contributor

@james-garner-canonical james-garner-canonical left a comment

Choose a reason for hiding this comment

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

I'm happy with things being fixed this way. Arguably it would be nicer to use true instead, to avoid needing to assert on __cause__, and perhaps be a bit more future looking, but I'm fine with either way.

Copy link
Copy Markdown
Collaborator

@tonyandrewmeyer tonyandrewmeyer left a comment

Choose a reason for hiding this comment

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

My preference would be that we did this but used true and adjusted the test as necessary. Long term we want that to be the default behaviour so it seems more logical to head in that direction.

@dimaqq dimaqq changed the title test: explicitly set SCENARIO_BARE_CHARM_ERRORS=false in Ops own tests that need it test: set SCENARIO_BARE_CHARM_ERRORS=true in Ops tests that care Feb 12, 2026
Copy link
Copy Markdown
Collaborator

@tonyandrewmeyer tonyandrewmeyer left a comment

Choose a reason for hiding this comment

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

It's a noisier diff, but I think it's definitely better this way around.

@dimaqq dimaqq merged commit 0a0fd65 into canonical:main Feb 18, 2026
60 checks passed
@dimaqq dimaqq deleted the test-annotate-base-charm-errors branch February 18, 2026 06:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Should Ops own tests pass with both SCENARIO_BARE_CHARM_ERRORS on and off?

3 participants