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

[Cory Johns]

Fix for lint errors during bundle test: http://reports.vapour.ws/all-bundle-and-charm-results/charm-bundle-test-parent-5290/charm/aws/27

(Pastebin in case previous link dies: http://pastebin.ubuntu.com/15331145/)

[lp:~johnsca/charms/trusty/rsyslog-forwarder-ha/lint]

12. By Cory Johns on 2016-03-09

Fix `make test` breaking subsequent charm-proof during bundle test

[Kevin W Monroe (kwmonroe)]

LGTM, merged

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-10-02 19:00:41 +0000
+++ .bzrignore	2016-03-09 20:48:40 +0000
@@ -1,1 +1,3 @@
 .coverage
+.tox
+.cache

=== modified file 'Makefile'
--- Makefile	2015-10-02 19:00:41 +0000
+++ Makefile	2016-03-09 20:48:40 +0000
@@ -4,12 +4,12 @@
 build: sync-charm-helpers lint
 
 lint:
-	@flake8 --exclude hooks/charmhelpers --ignore=E125,F401 hooks
+	@flake8 --exclude hooks/charmhelpers --ignore=E125,F401,E402 hooks
 
 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
+	@dpkg -s python-tox > /dev/null || sudo apt-get install -yq python-tox
+	@dpkg -s python-apt > /dev/null || sudo apt-get install -yq python-apt
+	@tox
 
 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 'test_requirements.txt'
--- test_requirements.txt	2015-10-02 19:00:41 +0000
+++ test_requirements.txt	2016-03-09 20:48:40 +0000
@@ -1,3 +1,4 @@
+pytest
 PyYAML==3.10
 SQLAlchemy==0.9.4
 mock==1.0.1

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2016-03-09 20:48:40 +0000
@@ -0,0 +1,12 @@
+[tox]
+skipsdist=True
+envlist = py27
+
+[testenv]
+commands = py.test -v {posargs:tests/unit}
+deps =
+    -r{toxinidir}/test_requirements.txt
+setenv =
+    PYTHONPATH = {toxinidir}:{toxinidir}/hooks
+# sitepackages needed for python-apt
+sitepackages = True