Skip to content
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

Jump to bottom

[resources test] fix expected status messages #15426

Merged
merged 1 commit into from Apr 5, 2023
Merged

[resources test] fix expected status messages #15426

merged 1 commit into from Apr 5, 2023

Conversation

barrettj12
Copy link
Contributor

@barrettj12 barrettj12 commented Apr 5, 2023 •
edited

The resources test run_resource_refresh_no_new_charm_rev_supply_res_rev was failing because the test was expecting the wrong status messages.

The messages should match the resources listed here.

juju-qa-test from latest/stable deploys with resource revision 2:

$ juju charm-resources juju-qa-test --channel latest/stable
Resource  Revision
foo-file  2

which has the message testing two.

When the foo-file resource is updated to revision 3, it should have the message testing one plus one.

QA steps

cd tests
./main.sh -v resources run_resource_refresh_no_new_charm_rev_supply_res_rev

@barrettj12
[resources test] fix expected status messages
06380f6 
in run_resource_refresh_no_new_charm_rev_supply_res_rev
tlm
tlm approved these changes Apr 5, 2023
View reviewed changes
Copy link
Member

@tlm tlm left a comment

Choose a reason for hiding this comment

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

lgtm

hmlanigan
hmlanigan approved these changes Apr 5, 2023
View reviewed changes
Copy link
Member

@hmlanigan hmlanigan left a comment

Choose a reason for hiding this comment

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

Thanks for fixing my error!

@hmlanigan
Copy link
Member

/merge

@jujubot jujubot merged commit 389497b into juju:2.9 Apr 5, 2023
3 checks passed
@barrettj12 barrettj12 deleted the supply-res-rev branch April 5, 2023 23:29
@jack-w-shaw jack-w-shaw mentioned this pull request Apr 6, 2023
Merged
jujubot added a commit that referenced this pull request Apr 6, 2023
@jujubot
Merge pull request #15442 from jack-w-shaw/merge-2.9-into-3.0
41e9c69 
#15442

Forward merge:
- #15423
- #15426
- #15431
- #15437

Some conflicts with tests/suites/deploy/deploy_default_series.sh

NOTE: the cs parts are removed from this test in 3.1
@jack-w-shaw jack-w-shaw mentioned this pull request Apr 6, 2023
Merged
jujubot added a commit that referenced this pull request Apr 6, 2023
@jujubot
Merge pull request #15443 from jack-w-shaw/merge-3.0-into-3.1
7009f54 
#15443

Merges:
- #15423
- #15426
- #15431
- #15437
- #15438
- #15442

Trivial conflict with tests/suites/deploy/deploy_default_series.sh
@jack-w-shaw jack-w-shaw mentioned this pull request Apr 6, 2023
Merged
jujubot added a commit that referenced this pull request Apr 6, 2023
@jujubot
Merge pull request #15444 from jack-w-shaw/merge-3.1-into-3.2
43a53dd 
#15444

Merges:
- #15423
- #15426
- #15431
- #15437
- #15438

No conflicts
@jack-w-shaw jack-w-shaw mentioned this pull request Apr 17, 2023
Merged
jujubot added a commit that referenced this pull request Apr 17, 2023
@jujubot
Merge pull request #15494 from jack-w-shaw/3.2-into-develop
44387bc 
#15494

Merges:
- #15399
- #15395
- #15414
- #15417
- #15418
- #15419
- #15413
- #15420
- #15422
- #15424
- #15416
- #15428
- #15423
- #15426

Conflicts resolved trivially
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tlm tlm tlm approved these changes

@hmlanigan hmlanigan hmlanigan approved these changes

@hpidcock hpidcock Awaiting requested review from hpidcock

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@barrettj12 @hmlanigan @tlm @jujubot