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

[Kevin W Monroe]

actually test the login capabilities at the end of 100-deploy

[lp:~kwmonroe/charms/trusty/mediawiki/test-updates]

86. By Kevin W Monroe on 2015-10-16

handle adding a new admin better (set -e causes us to fail fast if adding an existing user; trick it with "|| true" so we can properly inform the user of the problem).

87. By Kevin W Monroe on 2015-10-16

add our test admin after the db relation has been validated. the config-changed hook wont add an admin unless certain files are present (meaning we have a db connection). setting this config too early looks like it works, but the admin is never actually created.

[Charles Butler (lazypower)]

+1'd and rolled into tvansteenburgh's MP upstream

review: Approve

Unmerged revisions

87. By Kevin W Monroe on 2015-10-16

add our test admin after the db relation has been validated. the config-changed hook wont add an admin unless certain files are present (meaning we have a db connection). setting this config too early looks like it works, but the admin is never actually created.

86. By Kevin W Monroe on 2015-10-16

handle adding a new admin better (set -e causes us to fail fast if adding an existing user; trick it with "|| true" so we can properly inform the user of the problem).

85. By Kevin W Monroe on 2015-10-16

update test to exercise login

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-07-14 21:50:00 +0000
+++ hooks/config-changed	2015-10-16 23:18:46 +0000
@@ -82,9 +82,13 @@
     for admin in $admins ; do
         user=`echo $admin | cut -d: -f1`
         pass=`echo $admin | cut -d: -f2`
-        output=`php createAndPromote.php --conf /etc/mediawiki/LocalSettings.php $user $pass`
-        if [ ! "$output" = "account exists." ] ; then
-            echo $output
+        # createAndPromote.php will exit non-zero if the user already exists.
+        # Since this hook is set -e, it would exit immediately unless we used
+        # ' || true' at the end. This lets us properly inform the user of the
+        # error, versus having a failed config-changed hook with no message.
+        user_count=`php createAndPromote.php --conf /etc/mediawiki/LocalSettings.php $user $pass 2>&1 | grep -c "account exists" || true`
+        if [ $user_count -gt 0 ] ; then
+            echo "ERROR: $user account already exists"
             exit 1
         fi
     done
 
=== modified file 'tests/100-deploy'
--- tests/100-deploy	2015-10-16 20:40:21 +0000
+++ tests/100-deploy	2015-10-16 23:18:46 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import amulet
 import requests
+import time
 
 seconds = 900
 
@@ -10,7 +11,7 @@
 d.add('mysql')
 d.add('memcached')
 d.add('mediawiki')
-d.configure('mediawiki', {'admins': 'tom:swordfish', 'name': 'amulet-wiki'})
+d.configure('mediawiki', {'name': 'amulet-wiki'})
 d.configure('memcached', {'allow-ufw-ip6-softfail': True})
 d.relate('mysql:db', 'mediawiki:db')
 d.relate('memcached:cache', 'mediawiki:cache')
@@ -70,11 +71,20 @@
     amulet.raise_status(amulet.FAIL,
                         "Unable to validate configuration for wiki-name")
 
-login_url = "http://%s/mediawiki/index.php?title=" % mw_ip
-payload = {'wpName': 'tom', 'wpPassword': 'swordfish'}
+# Add an admin (now that we validated a good db connection)
+d.configure('mediawiki', {'admins': 'tom:swordfish'})
+# Give the config-changed hook 30s to settle
+time.sleep(30)
+login_url = "http://%s/mediawiki/api.php?action=login&lgname=tom&lgpassword=swordfish&format=json" % mw_ip
 
+# Test that we can login with the newly created admin
 with requests.Session() as s:
+    # hit the login url with credentials, retrieve a token to use for later validation
+    resp = s.post(login_url)
+    token = resp.json()['login']['token']
 
-    resp = s.post(login_url, data=payload)
-    if resp.text.find("<title>amulet-wiki") == -1:
-        amulet.raise_status(amulet.FAIL, "Unable to validate admin login")
+    # hit the login url again with creds+token to verify if we are successfully logged in
+    resp2 = s.post(login_url+'&lgtoken=%s' % token, cookies=resp.cookies)
+    result = resp2.json()['login']['result']
+    if result != "Success":
+        amulet.raise_status(amulet.FAIL, "Unable to validate admin login: %s" % result)