Merge lp:~kwmonroe/charms/trusty/rsyslog-forwarder-ha/testfix into lp:charms/trusty/rsyslog-forwarder-ha

[Kevin W Monroe]

Fix test, update series to trusty.

[Cory Johns (johnsca)]

+1 merged

review: Approve

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/4637/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/4657/

review: Approve (automated testing)

=== removed file 'tests/00_setup.sh'
--- tests/00_setup.sh	2015-10-02 19:00:41 +0000
+++ tests/00_setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# The script installs amulet and other tools needed for the amulet tests.
-
-set -x 
-
-# Get the status of the amulet package, this returns 0 of package is installed.
-dpkg -s amulet
-if [ $? -ne 0 ]; then
-  # Install the Amulet testing harness.
-  sudo add-apt-repository -y ppa:juju/stable
-  sudo apt-get update 
-  sudo apt-get install -y amulet
-fi
 
=== modified file 'tests/10_deploy_test.py'
--- tests/10_deploy_test.py	2015-10-02 19:00:41 +0000
+++ tests/10_deploy_test.py	2016-06-09 23:44:06 +0000
@@ -15,7 +15,7 @@
 
     def test_deployment_single(self):
         """Test a rsyslog-forwarder-ha deployment"""
-        self.deployment = amulet.Deployment(series="precise",
+        self.deployment = amulet.Deployment(series="trusty",
                                             sentries=False)
 
         self.deployment.add("rsyslog-master", charm="rsyslog")
@@ -29,7 +29,8 @@
         self.deployment.relate("rsyslog-forwarder-ha:syslog",
                                "rsyslog-slave:aggregator")
 
-        self.deployment._relate("postgresql", "rsyslog-forwarder-ha")
+        self.deployment.relate("postgresql:juju-info",
+                               "rsyslog-forwarder-ha:juju-info")
 
         self.deployment.expose("rsyslog-master")
         self.deployment.expose("rsyslog-slave")
 
=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2016-06-09 23:44:06 +0000
@@ -0,0 +1,3 @@
+reset: false
+packages:
+  - amulet