Merge lp:~johnsca/charms/trusty/rsyslog-forwarder-ha/cwr into lp:charms/trusty/rsyslog-forwarder-ha

[Cory Johns]

Cleanup of tests to get passing on CWR as part of the realtime-syslog-analytics bundle.

[Tim Van Steenburgh (tvansteenburgh)]

Excellent, thanks Cory.

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-10-02 19:23:27 +0000
@@ -0,0 +1,1 @@
+.coverage

=== modified file 'Makefile'
--- Makefile	2014-05-02 19:55:18 +0000
+++ Makefile	2015-10-02 19:23:27 +0000
@@ -6,15 +6,11 @@
 lint:
 	@flake8 --exclude hooks/charmhelpers --ignore=E125,F401 hooks
 
-functional:
-	@PYTHONPATH=$(PYTHON_PATH):hooks/ nosetests --nologcapture tests/functional/
-
-unit:
-	#@pip install -r test_requirements.txt
+test:
+	@dpkg -s python-apt > /dev/null || sudo apt-get install python-apt
+	@sudo pip install -r test_requirements.txt
 	@PYTHONPATH=$(PYTHON_PATH):hooks/ nosetests --nologcapture tests/unit
 
-test: functional unit
-
 bin/charm_helpers_sync.py:
 	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py > bin/charm_helpers_sync.py
 

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-05-02 19:55:18 +0000
+++ metadata.yaml	2015-10-02 19:23:27 +0000
@@ -2,7 +2,7 @@
 maintainer: Jorge Niedbalski <[e-mail]>
 subordinate: true
 summary: forwards local syslog to multiple remote syslog servers.
-categories: ["system"]
+tags: ["system"]
 description: |
   Uses rsyslogs facilities to forward to multiple remote syslog servers.
 requires:

=== modified file 'test_requirements.txt'
--- test_requirements.txt	2014-05-02 20:12:12 +0000
+++ test_requirements.txt	2015-10-02 19:23:27 +0000
@@ -1,15 +1,3 @@
 PyYAML==3.10
 SQLAlchemy==0.9.4
-amulet==1.4.0
-argparse==1.2.1
-bzr==2.6.0
-charmworldlib==0.3.0
-coverage==3.7.1
-juju-deployer==0.3.8
-jujuclient==0.17.7
 mock==1.0.1
-nose==1.3.1
-python-apt==0.0.0
-requests==2.2.1
-websocket-client==0.12.0
-wsgiref==0.1.2

=== added file 'tests/00_setup.sh'
--- tests/00_setup.sh	1970-01-01 00:00:00 +0000
+++ tests/00_setup.sh	2015-10-02 19:23:27 +0000
@@ -0,0 +1,14 @@
+#!/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' (properties changed: -x to +x)
--- tests/10_deploy_test.py	2014-05-02 19:55:18 +0000
+++ tests/10_deploy_test.py	2015-10-02 19:23:27 +0000
@@ -14,7 +14,7 @@
         pass
 
     def test_deployment_single(self):
-        """Test a deployment with no replication-mode set"""
+        """Test a rsyslog-forwarder-ha deployment"""
         self.deployment = amulet.Deployment(series="precise",
                                             sentries=False)
 
@@ -34,16 +34,8 @@
         self.deployment.expose("rsyslog-master")
         self.deployment.expose("rsyslog-slave")
 
-        seconds = 300
-        try:
-            self.deployment.setup(timeout=seconds)
-        except amulet.helpers.TimeoutError:
-            message = 'The environment did not setup in %d seconds.' % seconds
-            amulet.raise_status(amulet.SKIP, msg=message)
-        except:
-            raise
-
-        self.deployment.cleanup()
+        self.deployment.setup(timeout=600)
+        self.deployment.sentry.wait(timeout=600)
 
 
 if __name__ == "__main__":

=== removed directory 'tests/functional'
=== removed file 'tests/functional/00_setup.sh'
--- tests/functional/00_setup.sh	2014-05-02 19:55:18 +0000
+++ tests/functional/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

=== removed file 'tests/functional/10_deploy_test.py'
--- tests/functional/10_deploy_test.py	2014-05-02 19:55:18 +0000
+++ tests/functional/10_deploy_test.py	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-__author__ = 'Jorge Niedbalski R. <[e-mail]>'
-
-
-import amulet
-import unittest
-
-
-class RsyslogForwarder(unittest.TestCase):
-
-    def setUp(self):
-        pass
-
-    def test_deployment_single(self):
-        """Test a rsyslog-forwarder-ha deployment"""
-        self.deployment = amulet.Deployment(series="precise",
-                                            sentries=False)
-
-        self.deployment.add("rsyslog-master", charm="rsyslog")
-        self.deployment.add("rsyslog-slave", charm="rsyslog")
-        self.deployment.add("rsyslog-forwarder-ha")
-        self.deployment.add("postgresql")
-
-        self.deployment.relate("rsyslog-forwarder-ha:syslog",
-                               "rsyslog-master:aggregator")
-
-        self.deployment.relate("rsyslog-forwarder-ha:syslog",
-                               "rsyslog-slave:aggregator")
-
-        self.deployment._relate("postgresql", "rsyslog-forwarder-ha")
-
-        self.deployment.expose("rsyslog-master")
-        self.deployment.expose("rsyslog-slave")
-
-        seconds = 300
-        try:
-            self.deployment.setup(timeout=seconds)
-        except amulet.helpers.TimeoutError:
-            message = 'The environment did not setup in %d seconds.' % seconds
-            amulet.raise_status(amulet.SKIP, msg=message)
-        except:
-            raise
-
-
-if __name__ == "__main__":
-    unittest.main()