update makefile unit test target
This commit is contained in:
parent
d7033540a7
commit
0a852af7ff
20
Makefile
20
Makefile
|
@ -2,28 +2,28 @@
|
||||||
PYTHON := /usr/bin/env python
|
PYTHON := /usr/bin/env python
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
@flake8 --exclude hooks/charmhelpers actions hooks unit_tests tests
|
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
|
||||||
|
actions hooks unit_tests tests
|
||||||
@charm proof
|
@charm proof
|
||||||
|
|
||||||
unit_test:
|
test:
|
||||||
|
@# Bundletester expects unit tests here.
|
||||||
@echo Starting unit tests...
|
@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:
|
bin/charm_helpers_sync.py:
|
||||||
@mkdir -p bin
|
@mkdir -p bin
|
||||||
@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
|
@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
|
||||||
> bin/charm_helpers_sync.py
|
> bin/charm_helpers_sync.py
|
||||||
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
|
|
||||||
|
|
||||||
sync: bin/charm_helpers_sync.py
|
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-hooks.yaml
|
||||||
@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
|
@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
|
||||||
|
|
||||||
publish: lint unit_test
|
publish: lint test
|
||||||
bzr push lp:charms/nova-cloud-controller
|
bzr push lp:charms/nova-cloud-controller
|
||||||
bzr push lp:charms/trusty/nova-cloud-controller
|
bzr push lp:charms/trusty/nova-cloud-controller
|
||||||
|
|
Loading…
Reference in New Issue