Merge lp:~mbruzek/charms/precise/rsyslog-forwarder/add-tests into lp:charms/rsyslog-forwarder

[Matt Bruzek]

Adding tests and adding a tag to the metadata.yaml for rsyslog-forwarder

[lp:~mbruzek/charms/precise/rsyslog-forwarder/add-tests]

11. By Matt Bruzek on 2014-12-08

Removing the autogen tests, and changing the bundle to be precise only.

[Review Queue (review-queue)]

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

review: Needs Fixing (automated testing)

[José Antonio Rey (jose)]

These tests pass with no errors at all. Thanks, Matt!

+1 LGTM

review: Approve

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-09-11 15:54:09 +0000
+++ metadata.yaml	2014-12-08 21:25:18 +0000
@@ -4,6 +4,8 @@
 summary: forwards local syslog to remote syslog server
 description: |
   Uses rsyslogs facilities to forward to a remote syslog server.
+tags: 
+  - network
 requires:
   juju-info:
     interface: juju-info

=== added directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2014-12-08 21:25:18 +0000
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# This script sets up the requirements for amulet tests.
+
+set -x 
+
+# Check if amulet is installed before adding the stable repository and updating apt-get.
+dpkg -s amulet
+if [ $? -ne 0 ]; then
+    sudo add-apt-repository -y ppa:juju/stable
+    sudo apt-get update -qq
+    sudo apt-get install -y amulet
+fi
+
+# Install any additional python packages or other required software.

=== added file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	1970-01-01 00:00:00 +0000
+++ tests/10-bundles-test.py	2014-12-08 21:25:18 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+
+# This amulet test deploys the bundles.yaml file in this directory.
+
+import os
+import unittest
+import yaml
+import amulet
+
+seconds_to_wait = 720
+
+
+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)
+
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file

=== added file 'tests/bundles.yaml'
--- tests/bundles.yaml	1970-01-01 00:00:00 +0000
+++ tests/bundles.yaml	2014-12-08 21:25:18 +0000
@@ -0,0 +1,26 @@
+rsyslog-forwarder-ubuntu-rsyslog:
+  services:
+    "rsyslog-forwarder":
+      charm: "rsyslog-forwarder"
+      num_units: 0
+      annotations:
+        "gui-x": "0"
+        "gui-y": "0"
+    rsyslog:
+      charm: "cs:precise/rsyslog"
+      num_units: 1
+      annotations:
+        "gui-x": "-400"
+        "gui-y": "0"
+    ubuntu:
+      charm: "cs:precise/ubuntu"
+      num_units: 1
+      annotations:
+        "gui-x": "0"
+        "gui-y": "-400"
+  relations:
+    - - "rsyslog-forwarder:juju-info"
+      - "ubuntu:juju-info"
+    - - "rsyslog-forwarder:syslog"
+      - "rsyslog:aggregator"
+  series: precise