Merge lp:~tvansteenburgh/charms/trusty/mysql/fix-tests into lp:charms/trusty/mysql

Proposed by Tim Van Steenburgh
Status: Merged
Merged at revision: 151
Proposed branch: lp:~tvansteenburgh/charms/trusty/mysql/fix-tests
Merge into: lp:charms/trusty/mysql
Diff against target: 19 lines (+2/-2)
1 file modified
tests/010-configs (+2/-2)
To merge this branch: bzr merge lp:~tvansteenburgh/charms/trusty/mysql/fix-tests
Reviewer Review Type Date Requested Status
Cory Johns (community) Approve
Konstantinos Tsakalozos (community) Approve
Review Queue (community) automated testing Approve
Review via email: mp+277053@code.launchpad.net

Description of the change

Update tests to not hardcode unit names.

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

charm_lint_check #13372 mysql for tvansteenburgh mp277053
    LINT OK: passed

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

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

charm_unit_test #12509 mysql for tvansteenburgh mp277053
    UNIT OK: passed

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

Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #7829 mysql for tvansteenburgh mp277053
    AMULET OK: passed

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

Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1386/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1396/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-hp/1132/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-azure/1152/

review: Approve (automated testing)
Revision history for this message
Konstantinos Tsakalozos (kos.tsakalozos) wrote :

This patch looks ok for merging. Thank you.

review: Approve
Revision history for this message
Cory Johns (johnsca) wrote :

Looks good to me, as well. This has been merged upstream.

Thanks, Tim!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/010-configs'
2--- tests/010-configs 2015-04-21 14:02:44 +0000
3+++ tests/010-configs 2015-11-09 20:25:01 +0000
4@@ -26,13 +26,13 @@
5
6
7 # Allow connections from outside
8-mysqlmaster = d.sentry.unit['mysql/0']
9+mysqlmaster = d.sentry['mysql'][0]
10 mysqlmaster.run(
11 "echo 'GRANT ALL ON *.* to root@\"%\"'\""
12 " IDENTIFIED BY '`cat /var/lib/mysql/mysql.passwd`'\"|"
13 "mysql -u root --password=`cat /var/lib/mysql/mysql.passwd`"
14 )
15-mysql_server = d.sentry.unit['mysql/0']
16+mysql_server = d.sentry['mysql'][0]
17 mysql_password = mysql_server.file_contents('/var/lib/mysql/mysql.passwd')
18
19 connections = []

Subscribers

People subscribed via source and target branches

to all changes: