Merge lp://qastaging/~hopem/charms/trusty/mysql/fix-lp1425999 into lp://qastaging/charms/trusty/mysql

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 141
Proposed branch: lp://qastaging/~hopem/charms/trusty/mysql/fix-lp1425999
Merge into: lp://qastaging/charms/trusty/mysql
Diff against target: 366 lines (+160/-69)
5 files modified
Makefile (+5/-5)
hooks/charmhelpers/contrib/database/mysql.py (+42/-59)
hooks/charmhelpers/contrib/network/ip.py (+84/-1)
hooks/charmhelpers/core/services/helpers.py (+12/-4)
unit_tests/test_mysql_common.py (+17/-0)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/mysql/fix-lp1425999
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
Review via email: mp+251159@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #2134 mysql for hopem mp251159
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/10435847/
Build: http://10.245.162.77:8080/job/charm_unit_test/2134/

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

charm_lint_check #2345 mysql for hopem mp251159
    LINT OK: passed

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

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

charm_amulet_test #2265 mysql for hopem mp251159
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

142. By Edward Hope-Morley

synced ch and add unit test

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Hello Edward,

Thanks for your submission. I fixed the following lint errors:

unit_tests/test_mysql_common.py:6:1: E402 module level import not at top of file
unit_tests/test_mysql_common.py:13:9: F841 local variable 'h' is assigned to but never used
unit_tests/test_mysql_common.py:17:49: W292 no newline at end of file

Merged.

review: Approve

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

to all changes: