fix: creating offer when connecting to existing model, fixes #1264 #1265
Conversation
This file contains hidden or 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
Contributor
Author
|
Nevermind all integration tests failing, that's the case in the main branch too: https://github.com/juju/python-libjuju/commits/main/ |
Contributor
Author
|
Asking @benhoyt to review while @james-garner-canonical is away. |
benhoyt
approved these changes
May 21, 2025
Collaborator
benhoyt
left a comment
benhoyt
left a comment
There was a problem hiding this comment.
This looks good to me. Couple of nit comments. Let's just ensure we've tested this code path in real life (manually is okay).
Contributor
Author
|
I've merged #1268 into this PR. |
benhoyt
approved these changes
May 21, 2025
…when-connecting-to-existing-model
Contributor
Author
|
/build |
Contributor
Author
|
I've confirmed that the fix works manually. |
Contributor
Author
|
/merge |
Contributor
Author
|
/build |
Contributor
Author
|
/merge |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description
#1044 fixed proxy object reuse some time ago
I accidentally undid that change in #1186 as I didn't realise that multiple connect/close calls were expected on a given instance.
This PR re-applies the change, and cleans up init.
(I've rearranged the initialisation order, because
__del__()is run on a partially-initialised instance if__init__()fails half-way through. That's something that happens in unit tests, although unlikely to affect legitimate use.)Fixes: #1264 creating offer fails when connecting to existing model
QA Steps
All CI tests need to pass.
Fixes #1264