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

[Ryan Beisner]

Update test dependencies and normalize Makefiles across *oscharms.

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

charm_lint_check #11405 rabbitmq-server-next for 1chb1n mp273590
    LINT OK: passed

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

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

charm_unit_test #10601 rabbitmq-server-next for 1chb1n mp273590
    UNIT OK: passed

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

[lp:~1chb1n/charms/trusty/rabbitmq-server/next.normalize-makefile-test-deps]

120. By Ryan Beisner on 2015-10-06

update sync target

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

charm_lint_check #11423 rabbitmq-server-next for 1chb1n mp273590
    LINT OK: passed

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

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

charm_unit_test #10615 rabbitmq-server-next for 1chb1n mp273590
    UNIT OK: passed

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

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

charm_amulet_test #7148 rabbitmq-server-next for 1chb1n mp273590
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
2015-10-06 18:52:22,208 _test_rmq_amqp_messages_all_units DEBUG: Get message from: 172.17.104.190 (rabbitmq-server/0 juju-osci-sv04-machine-2)
ERROR:root:Make target returned non-zero.

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

[Ryan Beisner (1chb1n)]

^ unrelated amulet rmq cluster failure. Re-running anyway.

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

charm_amulet_test #7165 rabbitmq-server-next for 1chb1n mp273590
    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/12700386/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7165/

[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

=== modified file 'Makefile'
--- Makefile	2015-09-24 21:49:44 +0000
+++ Makefile	2015-10-06 18:44:01 +0000
@@ -26,7 +26,7 @@
         > bin/charm_helpers_sync.py
 
 sync: bin/charm_helpers_sync.py
-	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml
+	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
 	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
 
 publish: lint test
@@ -36,7 +36,7 @@
 test: .venv
 	@echo Starting tests...
 	env CHARM_DIR=$(CHARM_DIR) $(TEST_PREFIX) .venv/bin/nosetests \
-        --nologcapture --with-coverage unit_tests/
+        -v --nologcapture --with-coverage unit_tests/
 
 functional_test:
 	@echo Starting amulet tests...
 
=== renamed file 'charm-helpers.yaml' => 'charm-helpers-hooks.yaml'
=== modified file 'tests/00-setup'
--- tests/00-setup	2015-09-03 18:58:14 +0000
+++ tests/00-setup	2015-10-06 18:44:01 +0000
@@ -4,7 +4,8 @@
 
 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 \
 
=== modified file 'tests/tests.yaml'
--- tests/tests.yaml	2015-09-03 18:58:14 +0000
+++ tests/tests.yaml	2015-10-06 18:44:01 +0000
@@ -8,7 +8,7 @@
     - ppa:juju/stable
 packages:
     - amulet
-    - python-amulet
+    - distro-info-data
     - python-cinderclient
     - python-distro-info
     - python-glanceclient