Merge lp:~tvansteenburgh/charms/trusty/mediawiki/test-fixes into lp:charms/trusty/mediawiki

[Tim Van Steenburgh]

Update tests to not hardcode unit names.

[Tim Van Steenburgh (tvansteenburgh)]

Successful test run of this branch on lxc: http://reports.vapour.ws/charm-test-details/charm-bundle-test-parent-3450

[Review Queue (review-queue)]

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

review: Approve (automated testing)

[Review Queue (review-queue)]

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

review: Approve (automated testing)

[Review Queue (review-queue)]

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

review: Approve (automated testing)

[Review Queue (review-queue)]

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

review: Approve (automated testing)

[Konstantinos Tsakalozos (kos.tsakalozos)]

Jut run the test on local environment, lgtm. Thank you for your contributions!

review: Approve

[Kevin W Monroe (kwmonroe)]

Merged. This update should hit the charm store shortly. Thanks!

review: Approve

=== modified file 'tests/100-deploy'
--- tests/100-deploy	2015-10-16 23:18:26 +0000
+++ tests/100-deploy	2015-11-09 20:26:08 +0000
@@ -29,13 +29,14 @@
 except:
     raise
 
-mw_unit = d.sentry.unit['mediawiki/0']
-mysql_unit = d.sentry.unit['mysql/0']
+mw_unit = d.sentry['mediawiki'][0]
+mysql_unit = d.sentry['mysql'][0]
+memcached_unit = d.sentry['memcached'][0]
 
 #############################################################
 # Validate the DB Relationship using Amulet Sentry
 #############################################################
-sql_relation = d.sentry.unit['mysql/0'].relation('db', 'mediawiki:db')
+sql_relation = mysql_unit.relation('db', 'mediawiki:db')
 
 # Validate that the database server was set for the configuration of MediaWiki
 #Set search term for comparison, and cache the flag in the configuration file
@@ -52,8 +53,7 @@
 #############################################################
 # Validate the Memcached Relationship using Amulet Sentry
 #############################################################
-memcached_relation = d.sentry.unit['memcached/0'].relation(
-    'cache', 'mediawiki:cache')
+memcached_relation = memcached_unit.relation('cache', 'mediawiki:cache')
 output, code = mw_unit.run("cat /etc/mediawiki/memcached_settings.php \
     | grep wgMemCachedServers | tr -d \'array\(\)\; | awk '{printf $3}'")
 
@@ -63,7 +63,7 @@
 #############################################################
 # Validate the installation configuration using Requests
 #############################################################
-mw_ip = d.sentry.unit['mediawiki/0'].info['public-address']
+mw_ip = mw_unit.info['public-address']
 mw_url = "http://%s/mediawiki/index.php" % mw_ip
 response = requests.get(mw_url)