← Back to branch summary

~thedac/charms/trusty/glance/status-every-hook

« back to all changes in this revision

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

  • Committer: Corey Bryant
  • Date: 2015-09-30 15:06:46 UTC
  • mfrom: (141.2.4 fix-pause-resume-tests)
  • Revision ID: corey.bryant@canonical.com-20150930150646-gej3oi9reno6rwor
[ack,r=corey.bryant] Fix amulet tests for pause/resume actions and sync charm-helpers

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