← Back to branch summary

~billy-olsen/charms/trusty/cinder/public-endpoint-host

« back to all changes in this revision

Viewing changes to unit_tests/test_cinder_utils.py

  • Committer: Billy Olsen
  • Date: 2015-06-10 21:37:05 UTC
  • mfrom: (94.1.2 cinder)
  • Revision ID: billy.olsen@canonical.com-20150610213705-9uzzx00rtllk39f0
Merge with /next

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_cinder_utils.py
38
38
    'os_release',
39
39
    'get_os_codename_install_source',
40
40
    'configure_installation_source',
41
 
    'eligible_leader',
 
41
    'is_elected_leader',
42
42
    'templating',
43
43
    'install_alternative',
44
44
    # fetch
501
501
        self.config.side_effect = None
502
502
        self.config.return_value = 'cloud:precise-havana'
503
503
        services.return_value = ['cinder-api', 'cinder-volume']
504
 
        self.eligible_leader.return_value = True
 
504
        self.is_elected_leader.return_value = True
505
505
        self.get_os_codename_install_source.return_value = 'havana'
506
506
        configs = MagicMock()
507
507
        cinder_utils.do_openstack_upgrade(configs)
520
520
        self.config.side_effect = None
521
521
        self.config.return_value = 'cloud:precise-havana'
522
522
        services.return_value = ['cinder-api', 'cinder-volume']
523
 
        self.eligible_leader.return_value = False
 
523
        self.is_elected_leader.return_value = False
524
524
        self.get_os_codename_install_source.return_value = 'havana'
525
525
        configs = MagicMock()
526
526
        cinder_utils.do_openstack_upgrade(configs)