Merge lp://qastaging/~1chb1n/charms/trusty/keystone/amulet-svc-check-race-fix into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 175
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/keystone/amulet-svc-check-race-fix
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 335 lines (+118/-65)
5 files modified
Makefile (+1/-1)
tests/00-setup (+3/-1)
tests/basic_deployment.py (+11/-9)
tests/charmhelpers/contrib/amulet/utils.py (+101/-53)
tests/tests.yaml (+2/-1)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/keystone/amulet-svc-check-race-fix
Reviewer Review Type Date Requested Status
Billy Olsen Pending
OpenStack Charmers Pending
Review via email: mp+269501@code.qastaging.launchpad.net

Description of the change

* amulet test update - switch svc restart check to validate_service_config_changed re: bug 1474030
 * update makefile for unit test verbose
 * update amulet test dependencies
 * sync tests/charmhelpers for svc restart check race fix

This MP is dependent on charm-helpers changes landing first:
https://code.launchpad.net/~1chb1n/charm-helpers/amulet-svc-restart-race

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #8930 keystone-next for 1chb1n mp269501
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/8930/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #8253 keystone-next for 1chb1n mp269501
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8253/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #8934 keystone-next for 1chb1n mp269501
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/8934/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #8256 keystone-next for 1chb1n mp269501
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8256/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6080 keystone-next for 1chb1n mp269501
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6080/

174. By Ryan Beisner

resync tests/charmhelpers

175. By Ryan Beisner

rebase

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9226 keystone-next for 1chb1n mp269501
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/9226/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #8527 keystone-next for 1chb1n mp269501
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8527/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6187 keystone-next for 1chb1n mp269501
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6187/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches