Merge lp:~1chb1n/charms/trusty/glance/next.normalize-makefile-test-deps into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Ryan Beisner]

Update test dependencies and normalize Makefiles across *oscharms.

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10589 glance-next for 1chb1n mp273578
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10589/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11404 glance-next for 1chb1n mp273578
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11404/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7151 glance-next for 1chb1n mp273578
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7151/

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-06-30 20:43:41 +0000
+++ Makefile	2015-10-06 17:19:59 +0000
@@ -8,7 +8,7 @@
 
 test:
 	@# Bundletester expects unit tests here.
-	@$(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...
 
=== modified file 'tests/00-setup'
--- tests/00-setup	2015-07-02 12:51:38 +0000
+++ tests/00-setup	2015-10-06 17:19:59 +0000
@@ -4,11 +4,14 @@
 
 sudo add-apt-repository --yes ppa:juju/stable
 sudo apt-get update --yes
-sudo apt-get install --yes python-amulet \
+sudo apt-get install --yes amulet \
+                           distro-info-data \
                            python-cinderclient \
                            python-distro-info \
                            python-glanceclient \
                            python-heatclient \
                            python-keystoneclient \
+                           python-neutronclient \
                            python-novaclient \
+                           python-pika \
                            python-swiftclient
 
=== modified file 'tests/tests.yaml'
--- tests/tests.yaml	2015-06-30 20:43:41 +0000
+++ tests/tests.yaml	2015-10-06 17:19:59 +0000
@@ -8,11 +8,13 @@
     - ppa:juju/stable
 packages:
     - amulet
-    - python-amulet
+    - distro-info-data
     - python-cinderclient
     - python-distro-info
     - python-glanceclient
     - python-heatclient
     - python-keystoneclient
+    - python-neutronclient
     - python-novaclient
+    - python-pika
     - python-swiftclient