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

[Tim Van Steenburgh]

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

[lp:~tvansteenburgh/charms/trusty/mediawiki/fix-tests]

84. By Tim Van Steenburgh on 2015-10-16

Remove extraneous string

[Kevin W Monroe (kwmonroe)]

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:

https://code.launchpad.net/~kwmonroe/charms/trusty/mediawiki/test-updates/+merge/274793

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)]

+1

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

=== modified file 'tests/100-deploy'
--- tests/100-deploy	2014-10-28 20:34:37 +0000
+++ tests/100-deploy	2015-10-16 20:40:45 +0000
@@ -11,6 +11,7 @@
 d.add('memcached')
 d.add('mediawiki')
 d.configure('mediawiki', {'admins': 'tom:swordfish', 'name': 'amulet-wiki'})
+d.configure('memcached', {'allow-ufw-ip6-softfail': True})
 d.relate('mysql:db', 'mediawiki:db')
 d.relate('memcached:cache', 'mediawiki:cache')
 d.expose('mediawiki')
@@ -70,8 +71,6 @@
                         "Unable to validate configuration for wiki-name")
 
 login_url = "http://%s/mediawiki/index.php?title=" % mw_ip
-"Special:UserLogin&action=submitlogin&type=login&returnto=Main+Page"
-
 payload = {'wpName': 'tom', 'wpPassword': 'swordfish'}
 
 with requests.Session() as s: