From c38030e6515065b9681cffbe74c7b255582ddf3e Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 6 Oct 2015 15:21:42 +0000 Subject: [PATCH] update makefile --- Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 0f1df1c8..265b0091 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,18 @@ PYTHON := /usr/bin/env python lint: - @flake8 --exclude hooks/charmhelpers actions hooks unit_tests tests + @flake8 --exclude hooks/charmhelpers,tests/charmhelpers \ + actions hooks unit_tests tests @charm proof -unit_test: +test: + @# Bundletester expects unit tests here. @echo Starting unit tests... - @$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests + @$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests + +functional_test: + @echo Starting Amulet tests... + @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700 bin/charm_helpers_sync.py: @mkdir -p bin @@ -18,13 +24,6 @@ sync: bin/charm_helpers_sync.py @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml -test: - @echo Starting Amulet tests... - # coreycb note: The -v should only be temporary until Amulet sends - # raise_status() messages to stderr: - # https://bugs.launchpad.net/amulet/+bug/1320357 - @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700 - -publish: lint unit_test +publish: lint test bzr push lp:charms/nova-compute bzr push lp:charms/trusty/nova-compute