fix: add pebble log targets and checks to testing plan #1111
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks! My bad for missing log targets in #1074. |
tonyandrewmeyer
requested review from
tonyandrewmeyer and
benhoyt
and removed request for
tonyandrewmeyer
tonyandrewmeyer
changed the title
benhoyt
requested changes
Jan 23, 2024
ops/testing.py
Outdated
| for key in sorted(self._layers.keys()): | ||
| layer = self._layers[key] | ||
| for name, service in layer.services.items(): | ||
| # TODO: (jam) 2021-04-07 have a way to merge existing services | ||
| services[name] = service | ||
| services[name] = service.to_dict() |
There was a problem hiding this comment.
Hmm, not an issue with this PR, but looking at this code made me realize we're not even attempting to combine layers correctly here. We already have the code to combine a layer (in _TestingPebbleClient.add_layer), we just need to use it here as well.
We also have pebble.Service._merge, but we'll need similar _merge methods on pebble.Check and pebble.LogTarget and update appropriately to merge those blocks as well.
I think we can leave it "broken" in this PR (it's already broken now, so this doesn't make it worse), but I've opened #1112 to track.
benhoyt
requested changes
Jan 24, 2024
PietroPasotti
force-pushed
the
pebble-plan-include-checks-and-log-targets
branch
from
4168e63
to
269a0e7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue: adding a layer with checks or log-targets isn't reflected in the plan you obtain when testing through get_plan()
solution: make it reflect