Merge lp:~nicopace/charms/trusty/rsyslog/all-tests into lp:charms/trusty/rsyslog

[nicopace]

All rsyslog tests into one branch:
* basic test
* protocol change test

[Review Queue (review-queue)]

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

review: Needs Fixing (automated testing)

[nicopace (nicopace)]

The error on Azure seems to be a bug in the platform: http://reports.vapour.ws/charm-tests/charm-bundle-test-11072-results/charm/charm-testing-azure/0
The Lint errors are from the charm code and not the merging code: http://reports.vapour.ws/charm-tests/charm-bundle-test-11072-results/charm/charm-testing-lxc/1
The other error is a charm-helper error it seems: http://reports.vapour.ws/charm-tests/charm-bundle-test-11072-results/charm/charm-testing-lxc/2

=== added file 'tests/11-basic-test.py'
--- tests/11-basic-test.py	1970-01-01 00:00:00 +0000
+++ tests/11-basic-test.py	2015-02-27 19:03:39 +0000
@@ -0,0 +1,32 @@
+#!/usr/bin/python3
+
+import amulet
+
+seconds = 20000
+
+d = amulet.Deployment(series='trusty')
+
+d.add('mysql')
+d.add('rsyslog')
+d.add('rsyslog-forwarder-ha')
+d.relate('rsyslog-forwarder-ha:juju-info', 'mysql:juju-info')
+d.relate('rsyslog-forwarder-ha:syslog', 'rsyslog:syslog')
+
+try:
+    d.setup(timeout=seconds)
+except amulet.helpers.TimeoutError:
+    amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+except:
+    raise
+
+mysql_unit = d.sentry.unit['mysql/0']
+rsyslog_unit = d.sentry.unit['rsyslog/0']
+
+mysql_unit.run("logger 'testing'")
+
+grep_result, grep_code = rsyslog_unit.run("grep testing /var/log/syslog")
+
+if 'testing' not in grep_result:
+    amulet.raise_status(amulet.FAIL,
+                        'rsyslog relation not working properly '
+                        'between rsyslog and rsyslog-forwarder-ha.')

=== added file 'tests/12-protocol-change-test.py'
--- tests/12-protocol-change-test.py	1970-01-01 00:00:00 +0000
+++ tests/12-protocol-change-test.py	2015-02-27 19:03:39 +0000
@@ -0,0 +1,38 @@
+#!/usr/bin/python3
+
+import amulet
+
+seconds = 20000
+
+d = amulet.Deployment(series='trusty')
+
+d.add('mysql')
+d.add('rsyslog')
+d.configure('rsyslog', {
+    'protocol': 'relp'
+})
+d.add('rsyslog-forwarder-ha')
+d.configure('rsyslog-forwarder-ha', {
+    'protocol': 'relp'
+})
+d.relate('rsyslog-forwarder-ha:juju-info', 'mysql:juju-info')
+d.relate('rsyslog-forwarder-ha:syslog', 'rsyslog:syslog')
+
+try:
+    d.setup(timeout=seconds)
+except amulet.helpers.TimeoutError:
+    amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+except:
+    raise
+
+mysql_unit = d.sentry.unit['mysql/0']
+rsyslog_unit = d.sentry.unit['rsyslog/0']
+
+mysql_unit.run("logger 'testing'")
+
+grep_result, grep_code = rsyslog_unit.run("grep testing /var/log/syslog")
+
+if 'testing' not in grep_result:
+    amulet.raise_status(amulet.FAIL,
+                        'rsyslog relation not working properly '
+                        'between rsyslog and rsyslog-forwarder-ha.')