Charm Helpers

Merge lp:~1chb1n/charm-helpers/rmq-amulet-check-update into lp:charm-helpers

  1. rmq-amulet-check-update
  2. Merge into devel
Proposed by Ryan Beisner
Status: Merged
Approved by: James Page
Approved revision: 626
Merged at revision: 626
Proposed branch: lp:~1chb1n/charm-helpers/rmq-amulet-check-update
Merge into: lp:charm-helpers
Diff against target: 13 lines (+2/-1)
1 file modified
charmhelpers/contrib/openstack/amulet/utils.py (+2/-1)
To merge this branch: bzr merge lp:~1chb1n/charm-helpers/rmq-amulet-check-update
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+305407@code.launchpad.net

Description of the change

Update connection success logic in rabbitmq-server amulet test helper.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
2--- charmhelpers/contrib/openstack/amulet/utils.py 2016-08-01 13:48:43 +0000
3+++ charmhelpers/contrib/openstack/amulet/utils.py 2016-09-11 03:40:05 +0000
4@@ -1044,7 +1044,8 @@
5 retry_delay=5,
6 socket_timeout=1)
7 connection = pika.BlockingConnection(parameters)
8- assert connection.server_properties['product'] == 'RabbitMQ'
9+ assert connection.is_open is True
10+ assert connection.is_closing is False
11 self.log.debug('Connect OK')
12 return connection
13 except Exception as e:

Subscribers

People subscribed via source and target branches