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

Proposed by Cory Johns
Status: Merged
Merged at revision: 11
Proposed branch: lp:~johnsca/charms/trusty/rsyslog-forwarder-ha/lint
Merge into: lp:charms/trusty/rsyslog-forwarder-ha
Diff against target: 54 lines (+19/-4)
4 files modified
.bzrignore (+2/-0)
Makefile (+4/-4)
test_requirements.txt (+1/-0)
tox.ini (+12/-0)
To merge this branch: bzr merge lp:~johnsca/charms/trusty/rsyslog-forwarder-ha/lint
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+288469@code.launchpad.net

Description of the change

To post a comment you must log in.
12. By Cory Johns

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

Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

LGTM, merged

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2015-10-02 19:00:41 +0000
+++ .bzrignore 2016-03-09 20:48:40 +0000
@@ -1,1 +1,3 @@
1.coverage1.coverage
2.tox
3.cache
24
=== modified file 'Makefile'
--- Makefile 2015-10-02 19:00:41 +0000
+++ Makefile 2016-03-09 20:48:40 +0000
@@ -4,12 +4,12 @@
4build: sync-charm-helpers lint4build: sync-charm-helpers lint
55
6lint:6lint:
7 @flake8 --exclude hooks/charmhelpers --ignore=E125,F401 hooks7 @flake8 --exclude hooks/charmhelpers --ignore=E125,F401,E402 hooks
88
9test:9test:
10 @dpkg -s python-apt > /dev/null || sudo apt-get install python-apt10 @dpkg -s python-tox > /dev/null || sudo apt-get install -yq python-tox
11 @sudo pip install -r test_requirements.txt11 @dpkg -s python-apt > /dev/null || sudo apt-get install -yq python-apt
12 @PYTHONPATH=$(PYTHON_PATH):hooks/ nosetests --nologcapture tests/unit12 @tox
1313
14bin/charm_helpers_sync.py:14bin/charm_helpers_sync.py:
15 @bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py > bin/charm_helpers_sync.py15 @bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py > bin/charm_helpers_sync.py
1616
=== 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 @@
1pytest
1PyYAML==3.102PyYAML==3.10
2SQLAlchemy==0.9.43SQLAlchemy==0.9.4
3mock==1.0.14mock==1.0.1
45
=== 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 @@
1[tox]
2skipsdist=True
3envlist = py27
4
5[testenv]
6commands = py.test -v {posargs:tests/unit}
7deps =
8 -r{toxinidir}/test_requirements.txt
9setenv =
10 PYTHONPATH = {toxinidir}:{toxinidir}/hooks
11# sitepackages needed for python-apt
12sitepackages = True

Subscribers

People subscribed via source and target branches