← Back to branch summary

~celebdor/charms/trusty/neutron-api/plugin_pkg_fix

« back to all changes in this revision

Viewing changes to tests/charmhelpers/contrib/openstack/amulet/utils.py

  • Committer: Liam Young
  • Date: 2015-10-19 06:36:41 UTC
  • mfrom: (152.1.5 neutron-api)
  • Revision ID: liam.young@canonical.com-20151019063641-leixdk02j0dnv2g0
Tags: 15.10
[1chb1n, r=gnuoy] Update amulet tests for Trusty-Liberty, Wily-Liberty.

Sync charmhelpers.

Add service and relations to satisfy workload status ready state.

Add new logic to wait for extended status message to confirm deploy is ready, before testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/openstack/amulet/utils.py
752
752
            self.log.debug('SSL is enabled  @{}:{} '
753
753
                           '({})'.format(host, port, unit_name))
754
754
            return True
755
 
        elif not port and not conf_ssl:
 
755
        elif not conf_ssl:
756
756
            self.log.debug('SSL not enabled @{}:{} '
757
757
                           '({})'.format(host, port, unit_name))
758
758
            return False