Change the text used to match the model-removed error #11144
Merged
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
hmlanigan
reviewed
Jan 22, 2020
| # has been removed from the controller...` - old_model only | ||
| # contains the model name, hence the weird partial quoting so that | ||
| # it matches. | ||
| removed_error = b'{}" has been removed from the controller'.format(old_model) |
There was a problem hiding this comment.
Missing beginning double quote? Though I think the test will still work.
s/b'{}" has/b'"{}" has
There was a problem hiding this comment.
Perhaps I need an afternoon tea. Makes more sense after re-reading the comment.
There was a problem hiding this comment.
After chatting I think it's too confusing, tweaked it to just include the username admin and the starting double quote instead.
The old_model we have only contains the model name, not the user-qualified one. Update the template to include the username (which is always admin for this test. We haven't been able to reproduce this error locally in a reliable way unfortunately.
babbageclunk
force-pushed
the
2.7-fix-destroy-test
branch
from
cbe31eb to
3df9181
Compare
|
|
jujubot
added a commit
that referenced
this pull request
Jan 26, 2020
#11151 ### Checklist - [x] Checked if it requires a [pylibjuju](https://github.com/juju/python-libjuju) change? - [x] Added [integration tests](https://github.com/juju/juju/tree/develop/tests) for the PR? - [x] Added or updated [doc.go](https://discourse.jujucharms.com/t/readme-in-packages/451) related to packages changed? - [x] Do comments answer the question of why design decisions were made? ---- ## Description of change This pulls the latest changes in the 2.7 branch into develop. Brings in: - #11139 from jameinel/2.7-detach-volume-state-changing-1860542 - #11141 from howbazaar/2.7-fix-provisioner-leak - #11144 from babbageclunk/2.7-fix-destroy-test - #11137 from ycliuhw/feature/vSphere-disk-resizing - #11146 from manadart/2.7-provisioner-worker-test - #11147 from manadart/relocate-systemd-files - #11150 from manadart/2.7-controller-integration-test - #11149 from manadart/2.7-systemd-upgrades (No conflicts when merging.)
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.
Description of change
The old_model we have only contains the model name, not the user-qualified one. To ensure it matches the error that comes back with the user name, include the username in the template (it's always "admin" in the test).
Example of the error: https://jenkins.juju.canonical.com/job/nw-destroy-model-lxd/2210/console
We haven't been able to reproduce this error locally in a reliable way unfortunately, which is why there's a bit of churn in this test.
QA steps
Run the destroy-model test, it passes.
Documentation changes
None
Bug reference
None