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

[Ryan Beisner]

Update test dependencies and normalize Makefiles across *oscharms.

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

charm_lint_check #11415 cinder-next for 1chb1n mp273577
    LINT OK: passed

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

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

charm_unit_test #10610 cinder-next for 1chb1n mp273577
    UNIT OK: passed

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

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

charm_amulet_test #7155 cinder-next for 1chb1n mp273577
    AMULET OK: passed

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

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-06-29 18:29:39 +0000
+++ Makefile	2015-10-06 17:19:53 +0000
@@ -9,7 +9,7 @@
 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 deployment tests...

=== modified file 'tests/00-setup'
--- tests/00-setup	2015-06-29 19:26:22 +0000
+++ tests/00-setup	2015-10-06 17:19:53 +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-29 18:28:03 +0000
+++ tests/tests.yaml	2015-10-06 17:19:53 +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