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

Proposed by Tim Van Steenburgh on 2015-09-21
Status: Merged
Merged at revision: 83
Proposed branch: lp:~tvansteenburgh/charms/trusty/mediawiki/fix-tests
Merge into: lp:charms/trusty/mediawiki
Diff against target: 20 lines (+1/-2)
1 file modified
tests/100-deploy (+1/-2)
To merge this branch: bzr merge lp:~tvansteenburgh/charms/trusty/mediawiki/fix-tests
Reviewer Review Type Date Requested Status
Charles Butler (community) 2015-09-21 Approve on 2015-11-05
Review via email:

Description of the change

Configure memcached to work w/o ipv6 so tests can run on lxc.

To post a comment you must log in.
84. By Tim Van Steenburgh on 2015-10-16

Remove extraneous string

Kevin W Monroe (kwmonroe) wrote :

Hey Tim, thanks for this update. Your change is super simple and I was able to run the tests successfully. Then I started poking around...

The last 100-deploy test doesn't actually test a login. It "posts" login data to the mediawiki homepage, and then just checks that the <title> has our expected config. There's no form submission going on in that exercise, so it's not really a valid login test. Mediawiki exposes a login api that we could use. Here's an MP for your MP:

Again, i know you didn't introduce this issue, but if you're gonna call your branch "fix-tests", by golly, let's fix 'em.

Charles Butler (lazypower) wrote :


Thanks for the update Kevin, I've approved + merged both linked branches. These passed when running locally and against aws. I assume this is good for the other substrates.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/100-deploy'
2--- tests/100-deploy 2014-10-28 20:34:37 +0000
3+++ tests/100-deploy 2015-10-16 20:40:45 +0000
4@@ -11,6 +11,7 @@
5 d.add('memcached')
6 d.add('mediawiki')
7 d.configure('mediawiki', {'admins': 'tom:swordfish', 'name': 'amulet-wiki'})
8+d.configure('memcached', {'allow-ufw-ip6-softfail': True})
9 d.relate('mysql:db', 'mediawiki:db')
10 d.relate('memcached:cache', 'mediawiki:cache')
11 d.expose('mediawiki')
12@@ -70,8 +71,6 @@
13 "Unable to validate configuration for wiki-name")
15 login_url = "http://%s/mediawiki/index.php?title=" % mw_ip
18 payload = {'wpName': 'tom', 'wpPassword': 'swordfish'}
20 with requests.Session() as s:


People subscribed via source and target branches

to all changes: