Merge lp:~james-page/charms/trusty/rabbitmq-server/kilo-support into lp:charms/trusty/rabbitmq-server

[James Page]

Resync helpers to get support for new Kilo cloud archive pockets.

[lp:~james-page/charms/trusty/rabbitmq-server/kilo-support]

80. By James Page on 2015-01-21

Fixup parsing for newer rabbitmq

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

charm_lint_check #929 trusty-rabbitmq-server for james-page mp247112
    LINT OK: passed

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

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

charm_unit_test #958 trusty-rabbitmq-server for james-page mp247112
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  Storing debug log for failure in /var/lib/jenkins/.pip/pip.log
  make: *** [.venv] Error 1

Full unit test output: http://paste.ubuntu.com/9803906/
Build: http://10.245.162.77:8080/job/charm_unit_test/958/

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

charm_amulet_test #1151 trusty-rabbitmq-server for james-page mp247112
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 124
  make: *** [functional_test] Error 124

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

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

charm_lint_check #930 trusty-rabbitmq-server for james-page mp247112
    LINT OK: passed

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

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

charm_unit_test #959 trusty-rabbitmq-server for james-page mp247112
    UNIT OK: passed

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

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

charm_amulet_test #1152 trusty-rabbitmq-server for james-page mp247112
    AMULET OK: passed

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

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10965-results

review: Needs Fixing (automated testing)

[lp:~james-page/charms/trusty/rabbitmq-server/kilo-support]

81. By James Page on 2015-02-24

Rebase

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

charm_lint_check #2230 rabbitmq-server for james-page mp247112
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  unit_tests/test_rabbitmq_server_relations.py:6:1: E402 module level import not at top of file
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10396140/
Build: http://10.245.162.77:8080/job/charm_lint_check/2230/

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

charm_unit_test #2019 rabbitmq-server for james-page mp247112
    UNIT OK: passed

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

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

charm_amulet_test #2176 rabbitmq-server for james-page mp247112
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [functional_test] Error 1

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

[Charles Butler (lazypower)]

Thanks for the contribution @jamespage. I've taken the time to review this contribution and +1 LGTM.

review: Approve

=== modified file 'hooks/rabbit_utils.py'
--- hooks/rabbit_utils.py	2015-01-22 15:37:28 +0000
+++ hooks/rabbit_utils.py	2015-02-24 10:47:30 +0000
@@ -82,7 +82,12 @@
     try:
         output = subprocess.check_output([RABBITMQ_CTL, 'list_vhosts'])
 
-        return output.split('\n')[1:-2]
+        # NOTE(jamespage): Earlier rabbitmqctl versions append "...done"
+        #                  to the output of list_vhosts
+        if '...done' in output:
+            return output.split('\n')[1:-2]
+        else:
+            return output.split('\n')[1:-1]
     except Exception as ex:
         # if no vhosts, just raises an exception
         log(str(ex), level='DEBUG')