Merge lp:~mbruzek/charms/precise/solr-jetty/add-tests into lp:~charmers/charms/precise/solr-jetty/trunk

[Matt Bruzek]

Adding tests and fixing charm proof for solr-jetty charm.

[Matt Bruzek (mbruzek)]

It does not appear that the solr-jetty charm deploys successfully any longer. I opened a separate bug against that here: https://bugs.launchpad.net/charms/+source/solr-jetty/+bug/1401319

We still may want to check in these changes so solr-jetty passes charm proof and has a deployment test that we can later refer to.

[Review Queue (review-queue)]

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

review: Needs Fixing (automated testing)

[José Antonio Rey (jose)]

A bug has already been filed for the install hook failure, and tests work as expected.

+1 LGTM!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-07-16 23:47:53 +0000
+++ config.yaml	2014-12-10 23:52:05 +0000
@@ -2,19 +2,23 @@
   # Solr configuration
   schema:
     type: string
+    default:
     description: |
       Solr XML schema (base64 encoded).
   # Jetty configuration
   java-max-heap-mb:
     type: int
+    default:
     description: |
       Java options Max heap size (-Xmx)
   java-min-heap-mb:
     type: int
+    default:
     description: |
       Java options min heap size (-Xms)
   acceptors:
     type: int
+    default:
     description: |
       The number of threads dedicated to accepting incoming connections. 
   instance_type:

=== modified file 'metadata.yaml'
--- metadata.yaml	2013-04-22 18:39:37 +0000
+++ metadata.yaml	2014-12-10 23:52:05 +0000
@@ -7,6 +7,8 @@
   search, caching, replication, and a web administration interface. It
   runs in a Java servlet container such as Tomcat.  This package
   provides the Jetty integration files for Solr.
+tags: 
+  - application_development
 provides:
   website:
     interface: http

=== added directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2014-12-10 23:52:05 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo add-apt-repository ppa:juju/stable -y
+sudo apt-get update
+sudo apt-get install amulet python3-requests -y

=== added file 'tests/99-autogen'
--- tests/99-autogen	1970-01-01 00:00:00 +0000
+++ tests/99-autogen	2014-12-10 23:52:05 +0000
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+
+import amulet
+import requests
+import unittest
+
+
+seconds = 900
+
+class TestDeployment(unittest.TestCase):
+    @classmethod
+    def setUpClass(self):
+        self.deployment = amulet.Deployment(series='precise')
+
+        self.deployment.add('solr-jetty')
+        self.deployment.expose('solr-jetty')
+
+        try:
+            self.deployment.setup(timeout=seconds)
+            self.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            message = "The environment was not set up in %d seconds." % seconds
+            amulet.raise_status(amulet.SKIP, msg=message)
+        except:
+            raise
+
+    def test_case(self):
+        # Now you can use self.deployment.sentry.unit[UNIT] to address each of
+        # the units and perform more in-depth steps.  You can also reference
+        # the first unit as self.unit.
+        # There are three test statuses that can be triggered with
+        # amulet.raise_status():
+        #   - amulet.PASS
+        #   - amulet.FAIL
+        #   - amulet.SKIP
+        # Each unit has the following methods:
+        #   - .info - An array of the information of that unit from Juju
+        #   - .file(PATH) - Get the details of a file on that unit
+        #   - .file_contents(PATH) - Get plain text output of PATH file from that unit
+        #   - .directory(PATH) - Get details of directory
+        #   - .directory_contents(PATH) - List files and folders in PATH on that unit
+        #   - .relation(relation, service:rel) - Get relation data from return service
+        #          add tests here to confirm service is up and working properly
+        # For example, to confirm that it has a functioning HTTP server:
+        #     page = requests.get('http://{}'.format(self.unit.info['public-address']))
+        #     page.raise_for_status()
+        # More information on writing Amulet tests can be found at:
+        #     https://juju.ubuntu.com/docs/tools-amulet.html
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()