update tests

Makefile

@@ -2,16 +2,18 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	@echo "Running flake8 tests: "
-	@flake8 --exclude hooks/charmhelpers actions hooks unit_tests tests
-	@echo "OK"
-	@echo "Running charm proof: "
+	@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
+        actions hooks unit_tests tests
 	@charm proof
-	@echo "OK"
 
-unit_test:
+test:
+	@# Bundletester expects unit tests here.
 	@$(PYTHON) /usr/bin/nosetests --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
 	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
@@ -21,15 +23,8 @@ 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...
-	# /!\ 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/glance
 	bzr push lp:charms/trusty/glance
 
-all: unit_test lint
+all: test lint