Merge lp:~jose/charms/trusty/python-moinmoin/refactor-tests into lp:charms/trusty/python-moinmoin

[José Antonio Rey]

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-11016-results

review: Needs Fixing (automated testing)

[Adam Israel (aisrael)]

Hi José,

I had the opportunity to review this merge proposal today. I'm happy to report that all changes look good, and the tests are passing.

LGTM. +1

review: Approve

[Charles Butler (lazypower)]

Thanks adam, I've taken action on this MP based on your review.

review: Approve

=== modified file 'README.md'
--- README.md	2013-09-26 06:15:02 +0000
+++ README.md	2015-02-03 06:23:50 +0000
@@ -14,7 +14,7 @@
       admin_name: "Admin"
       languages: English French
       xapian_search: True
-      port: 80
+      listen_port: 80
 
 To then deploy the wiki, with pre-seeded configuration:
 
@@ -48,10 +48,10 @@
 
     juju set python_moinmoin xapian_search="True"
 
-# port
+# listen_port
 The port moinmoin should listen on. By default it's 8080
 
-    juju set python_moinmoin port=80
+    juju set python_moinmoin listen_port=80
 
 # use_openid
 Setting to say if the wiki is using OpenID authentication or not.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-09-19 06:09:37 +0000
+++ hooks/hooks.py	2015-02-03 06:23:50 +0000
@@ -104,7 +104,7 @@
         shutil.copytree('/usr/share/moin/underlay', basedir + "/underlay")
     if not os.path.exists(staticdir):
         shutil.copytree('/usr/share/moin/htdocs', staticdir)
-
+    open_port(listen_port)
 
 @hooks.hook("config-changed")
 def config_changed():

=== modified file 'tests/00-setup'
--- tests/00-setup	2014-10-29 21:59:41 +0000
+++ tests/00-setup	2015-02-03 06:23:50 +0000
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-set -ex
-
-# Check if amulet is installed before adding repository and updating apt-get.
-dpkg -s amulet
-if [ $? -ne 0 ]; then
-    sudo add-apt-repository -y ppa:juju/stable
-    sudo apt-get update
-    sudo apt-get install -y amulet python3-requests
-fi
-
-# Install any additional python packages or software here.
+sudo add-apt-repository ppa:juju/stable -y
+sudo apt-get update
+sudo apt-get install amulet python3-requests -y

=== removed file 'tests/10-bundle-test.py'
--- tests/10-bundle-test.py	2014-10-29 21:59:41 +0000
+++ tests/10-bundle-test.py	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-
-# This amulet test deploys the bundles.yaml file in this directory.
-
-import os
-import unittest
-import yaml
-import amulet
-import requests
-
-seconds_to_wait = 600
-
-
-class BundleTest(unittest.TestCase):
-    """ Create a class for testing the charm in the unit test framework. """
-    @classmethod
-    def setUpClass(cls):
-        """ Set up an amulet deployment using the bundle. """
-        d = amulet.Deployment()
-        bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
-        with open(bundle_path, 'r') as bundle_file:
-            contents = yaml.safe_load(bundle_file)
-            d.load(contents)
-        d.setup(seconds_to_wait)
-        d.sentry.wait(seconds_to_wait)
-        cls.d = d
-
-    def test_deployed(self):
-        """ Test to see if the bundle deployed successfully. """
-        self.assertTrue(self.d.deployed)
-
-    def test_response(self):
-        wiki = self.d.sentry.unit['python-moinmoin/0'].info['public-address']
-        pub_address = "http://{}:{}".format(wiki, 8080)
-        response = requests.get(pub_address)
-        response.raise_for_status()
-
-
-if __name__ == '__main__':
-    unittest.main()

=== added file 'tests/10-deploy'
--- tests/10-deploy	1970-01-01 00:00:00 +0000
+++ tests/10-deploy	2015-02-03 06:23:50 +0000
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+
+import amulet
+import requests
+import unittest
+
+
+class TestDeployment(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.deployment = amulet.Deployment(series='trusty')
+
+        cls.deployment.add('python-moinmoin')
+        cls.deployment.configure('python-moinmoin', {'wiki_name': 'Amulet Wiki',
+                                 'admin_name': 'citest', 'languages': 'English',
+                                 'xapian_search': 'True', 'listen_port': '8080',
+                                 'use_openid': 'False'})
+        cls.deployment.expose('python-moinmoin')
+
+        try:
+            cls.deployment.setup(timeout=900)
+            cls.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+        except:
+            raise
+
+        cls.unit = cls.deployment.sentry.unit['python-moinmoin/0']
+        cls.address = cls.unit.info['public-address']
+
+    def test_exposed(self):
+        website = 'http://%s:8080/' % self.address
+        r= requests.get(website)
+        r.raise_for_status()
+
+        string = 'Amulet Wiki'
+        find_text = r.text.find(string)
+        found_string = find_text != -1
+
+        if found_string:
+            print('MoinMoin seems to be running!')
+        else:
+            print('Apparently MoinMoin is not running.')
+            amulet.raise_status(amulet.FAIL)
+
+
+if __name__ == '__main__':
+    unittest.main()

=== removed file 'tests/100-deploy-test'
--- tests/100-deploy-test	2014-10-29 21:59:41 +0000
+++ tests/100-deploy-test	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-if [ -z "`which wget`" ] ; then
-    echo SKIP: need wget to run test.
-    exit 100
-fi
-
-set -ex
-
-teardown() {
-    juju destroy-service python-moinmoin
-    #juju destroy-service haproxy
-    if [ -n "$datadir" ] ; then
-        if [ -f $datadir/passed ]; then
-            rm -r $datadir
-        else
-            echo $datadir preserved
-        fi
-    fi
-}
-trap teardown EXIT
-
-
-juju deploy cs:precise/python-moinmoin
-juju deploy cs:precise/haproxy
-juju add-relation haproxy:reverseproxy python-moinmoin:website
-juju expose haproxy
-
-for try in `seq 1 600` ; do
-    host=`juju status | tests/get-unit-info haproxy public-address`
-    if [ -z "$host" ] ; then
-        sleep 1 
-    else
-        break
-    fi
-done
-
-if [ -z "$host" ] ; then
-    echo ERROR: status timed out 
-    exit 1
-fi
-
-if [ $try -eq 600 ] ; then
-    echo ERROR: Timed out waiting.
-    exit 1
-fi
-
-datadir=`mktemp -d ${TMPDIR:-/tmp}/wget.test.XXXXXXX`
-echo INFO: datadir=$datadir
-
-for try_wget in `seq 1 600` ; do
-    wget --timeout=6 http://$host/ -O - -a $datadir/wget.log
-    if [ $? -ne 0 ] ; then
-        sleep 1
-    else
-        break
-    fi
-done
-
-if [ $try_wget -eq 600 ] ; then
-    echo ERROR:The frontpage never show up
-    exit 1
-fi
-
-# Test English language
-wget --tries=100 --timeout=6 http://$host/FindPage -O - -a $datadir/wget.log 
-
-if [ $? -ne 0 ] ; then
-    echo ERROR: English Underlay not found
-    exit 1
-fi
-
-## Test Japanese language
-#wget --tries=100 --timeout=6 http://$host/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2 -O - -a $datadir/wget.log
-#
-#if [ $? -ne 0 ] ; then
-#    echo ERROR: Japanese Underlay not found
-#    exit 1
-#fi
-
-# Test the search engine
-wget --tries=100 --timeout=6 --user-agent=Firefox "http://$host/?action=fullsearch&context=180&value=Help&titlesearch=Titres" -O - -a $datadir/wget.log
-
-if [ $? -ne 0 ] ; then
-    echo ERROR: The search is not working
-    exit 1
-fi
-
-## Test admin user creation
-#wget --timeout=6 --user-agent=Firefox --post-data='name=Admin&password1=TestPass&password2=TestPass&email=[e-mail]' "http://$host/login?action=newaccount" -O - -a $datadir/wget.log
-#
-#if [ $? -ne 0 ] ; then
-#    echo ERROR: Not able to create admin user
-#    exit 1
-#fi
-#
-## Test admin user log-in
-#wget --timeout=6 "http://$host/login?action=login" --post-data='name=Admin&password=TestPass' --save-cookies=cookies.txt --keep-session-cookies -O - -a $datadir/wget.log
-#
-#if [ $? -ne 0 ] ; then
-#    echo ERROR: Not able to log in as admin user
-#    exit 1
-#fi
-#
-## Test super user permissions
-#wget --timeout=6 "http://$host/System?action=userprefs&sub=suid" --load-cookies=cookies.txt -O - -a $datadir/wget.log
-#
-#if [ $? -ne 0 ] ; then
-#    echo ERROR: Incorrect permissions for admin user
-#    exit 1
-#fi
-
-touch $datadir/passed
-
-trap - EXIT
-teardown
-
-echo INFO: PASS
-exit 0

=== removed file 'tests/bundles.yaml'
--- tests/bundles.yaml	2014-10-29 21:59:41 +0000
+++ tests/bundles.yaml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-python-moinmoin-starter: 
-  services: 
-    "python-moinmoin": 
-      charm: "python-moinmoin"
-      num_units: 1
-      exposed: true
-      options: 
-        wiki_name: amulet wiki
-      annotations: 
-        "gui-x": "300"
-        "gui-y": "300"
-    apache2: 
-      charm: "cs:trusty/apache2"
-      num_units: 1
-      annotations: 
-        "gui-x": "688"
-        "gui-y": "301"
-  relations: 
-    - - "apache2:reverseproxy"
-      - "python-moinmoin:website"
-  series: trusty 

=== removed file 'tests/get-unit-info'
--- tests/get-unit-info	2012-03-01 04:13:58 +0000
+++ tests/get-unit-info	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#!/usr/bin/python
-# machines:
-#   0: {dns-name: ec2-50-17-84-127.compute-1.amazonaws.com, instance-id: i-8c5c3fec}
-#   1: {dns-name: ec2-184-73-102-113.compute-1.amazonaws.com, instance-id: i-14a2c174}
-#   2: {dns-name: ec2-75-101-184-93.compute-1.amazonaws.com, instance-id: i-e0a2c180}
-# services:
-#   mysql:
-#     charm: local:mysql-11
-#     relations: {db: wordpress}
-#     units:
-#       mysql/0:
-#         machine: 2
-#         relations:
-#           db: {state: up}
-#         state: started
-#   wordpress:
-#     charm: local:wordpress-31
-#     exposed: true
-#     relations: {db: mysql}
-#     units:
-#       wordpress/0:
-#         machine: 1
-#         open-ports: []
-#         relations: {}
-#         state: null
-
-import yaml
-import sys
-from subprocess import Popen, PIPE
-
-
-def main():
-    d = yaml.safe_load(Popen(['juju','status'],stdout=PIPE).stdout)
-    srv = d.get("services", {}).get(sys.argv[1])
-    if srv is None:
-        return
-    units = srv.get("units", {})
-    if units is None:
-        return
-    item = units.items()[0][1].get(sys.argv[2])
-    if item is None:
-        return
-    print item
-
-if __name__ == "__main__":
-    main()

=== removed file 'tests/tests.yaml'
--- tests/tests.yaml	2014-10-29 21:59:41 +0000
+++ tests/tests.yaml	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-bootstrap: true
-reset: true
-tests: "10-bundle-test.py"