Update Makefile target names for consistency with other os-charms and bundletester;

Fix misc lint;

Makefile

@@ -2,12 +2,19 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	@flake8 --exclude hooks/charmhelpers hooks #unit_tests tests
+	@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
+        hooks unit_tests tests
 	@charm proof
 
-unit_test:
+test:
+	@# Bundletester expects unit tests here.
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
+	@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
+
+functional_test:
+	@echo Starting Amulet tests...
+	@tests/setup/00-setup
+	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin
@@ -17,10 +24,3 @@ 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-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

hooks/lib/PCIDev.py

@@ -302,8 +302,8 @@ class PCIInfo(dict):
         return True
 
     def get_user_requested_config(self):
-        ''' Parse the user requested config str mac=<mac>;net=<net>;vlan=<vlan> and
-        return a dict'''
+        ''' Parse the user requested config str
+        mac=<mac>;net=<net>;vlan=<vlan> and return a dict'''
         mac_net_config = {}
         mac_map = config('mac-network-map')
         if mac_map: