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

[Ryan Beisner]

Update test dependencies and normalize Makefiles across *oscharms.

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

charm_unit_test #10591 neutron-gateway-next for 1chb1n mp273589
    UNIT OK: passed

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

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

charm_lint_check #11412 neutron-gateway-next for 1chb1n mp273589
    LINT OK: passed

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

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

charm_amulet_test #7162 neutron-gateway-next for 1chb1n mp273589
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12699927/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7162/

[Ryan Beisner (1chb1n)]

^ totally unrelated amulet test fail. Re-running test anyway.

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

charm_amulet_test #7173 neutron-gateway-next for 1chb1n mp273589
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12701770/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7173/

[Ryan Beisner (1chb1n)]

Undercloud issue, pending resolution.

Since this MP doesn't touch tests or hooks, amulet failures are irrelevant.

[Corey Bryant (corey.bryant)]

review: Approve

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

charm_amulet_test #7181 neutron-gateway-next for 1chb1n mp273589
    AMULET OK: passed

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

=== modified file 'Makefile'
--- Makefile	2015-08-22 04:58:53 +0000
+++ Makefile	2015-10-06 17:21:07 +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 tests...

=== modified file 'tests/00-setup'
--- tests/00-setup	2015-08-22 04:58:53 +0000
+++ tests/00-setup	2015-10-06 17:21:07 +0000
@@ -5,6 +5,7 @@
 sudo add-apt-repository --yes ppa:juju/stable
 sudo apt-get update --yes
 sudo apt-get install --yes amulet \
+                           distro-info-data \
                            python-cinderclient \
                            python-distro-info \
                            python-glanceclient \

=== modified file 'tests/tests.yaml'
--- tests/tests.yaml	2015-08-22 04:58:53 +0000
+++ tests/tests.yaml	2015-10-06 17:21:07 +0000
@@ -8,7 +8,7 @@
     - ppa:juju/stable
 packages:
     - amulet
-    - python-amulet
+    - distro-info-data
     - python-cinderclient
     - python-distro-info
     - python-glanceclient