Merge lp://qastaging/~bjornt/charms/trusty/neutron-api/r177-amulet-fixes into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk

Proposed by Björn Tillenius
Status: Needs review
Proposed branch: lp://qastaging/~bjornt/charms/trusty/neutron-api/r177-amulet-fixes
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
tests/basic_deployment.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~bjornt/charms/trusty/neutron-api/r177-amulet-fixes
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+270631@code.qastaging.launchpad.net

Description of the change

Fix amulet failures introduced by r117.

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

charm_unit_test #8931 neutron-api for bjornt mp270631
    UNIT OK: passed

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

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

charm_lint_check #9706 neutron-api for bjornt mp270631
    LINT OK: passed

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

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

charm_amulet_test #6338 neutron-api for bjornt mp270631
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12329077/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6338/

119. By Björn Tillenius

Empty commit.

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

charm_lint_check #9774 neutron-api for bjornt mp270631
    LINT OK: passed

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

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

charm_unit_test #9002 neutron-api for bjornt mp270631
    UNIT OK: passed

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

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

charm_amulet_test #6356 neutron-api for bjornt mp270631
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12339586/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6356/

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

charm_lint_check #12342 neutron-api for bjornt mp270631
    LINT OK: passed

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

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

charm_unit_test #11450 neutron-api for bjornt mp270631
    UNIT OK: passed

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

Unmerged revisions

119. By Björn Tillenius

Empty commit.

118. By Björn Tillenius

Fix amulet failures.

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