Merge lp:~lazypower/charms/precise/mediawiki/lp_1292651 into lp:charms/mediawiki

[Charles Butler]

Refactors out phantomjs/selenium - uses requests and title validation.

[Cory Johns (johnsca)]

A hard-coded IP got left in the test which causes it to fail (see inline comment).

review: Needs Fixing

[Jorge Niedbalski (niedbalski)]

Tests not passing, please read inline comments.

review: Needs Fixing

[lp:~lazypower/charms/precise/mediawiki/lp_1292651]

80. By Charles Butler on 2014-07-10

José Antonio Rey 2014-06-20 Removed private IP address and changed it for a variable

[José Antonio Rey (jose)]

After the fix recently pushed, I ran the tests and they returned with a 0 exit code. Looks like they're ready for merging now.

review: Approve

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'tests/00-setup'
--- tests/00-setup	2014-02-21 23:29:26 +0000
+++ tests/00-setup	2014-07-10 02:27:07 +0000
@@ -6,5 +6,4 @@
 sudo apt-add-repository ppa:juju/stable -y
 sudo apt-get update
 
-sudo apt-get install amulet python3 python3-requests python3-dev python3-pip phantomjs -y
-sudo pip3 install splinter selenium
+sudo apt-get install amulet python3 python3-requests python3-dev python3-pip -y

=== modified file 'tests/100-deploy'
--- tests/100-deploy	2014-02-21 23:29:26 +0000
+++ tests/100-deploy	2014-07-10 02:27:07 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 import amulet
-from splinter import Browser
+import requests
 
 seconds = 900
 
@@ -59,26 +59,23 @@
                          memcached_relation['port'])
 
 #############################################################
-# Validate the installation configuration using PhantomJS
+# Validate the installation configuration using Requests
 #############################################################
-browser = Browser('phantomjs')
-browser.visit("http://%s/mediawiki/index.php?"
-              "title=Special:UserLogin&returnto=Main+Page" %
-              d.sentry.unit['mediawiki/0'].info['public-address'])
-
-
-title = str(browser.title).find("Log in")
-if title == -1:
-   amulet.raise_status(amulet.FAIL, msg="Failed login test.")
-
-title = str(browser.title).find("amulet-wiki")
-if title == -1:
-   amulet.raise_status(amulet.FAIL, msg="Failed to parse provided title")
-
-browser.fill("wpName", 'tom')
-browser.fill('wpPassword', 'swordfish')
-browser.find_by_id('wpLoginAttempt').first.click()
-
-if not browser.is_text_present('tom'):
-   amulet.raise_status(amulet.FAIL,
-                       msg="Failed to login with configured admin")
+mw_ip = d.sentry.unit['mediawiki/0'].info['public-address']
+mw_url = "http://%s/mediawiki/index.php" % mw_ip
+response = requests.get(mw_url)
+
+if response.content.find(b"<title>amulet-wiki") == -1:
+    amulet.raise_status(amulet.FAIL,
+                        "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:
+
+    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")