← Back to branch summary

~openstack-charmers-archive/charms/trusty/keystone/next

« back to all changes in this revision

Viewing changes to unit_tests/test_keystone_hooks.py

  • Committer: Liam Young
  • Date: 2015-10-20 15:15:56 UTC
  • mfrom: (188.1.4 keystone)
  • Revision ID: liam.young@canonical.com-20151020151556-f2pyzvpv1v3vwdcp
[gnuoy, r=james-page] Rexec config-changed hook after upgrade to avoid issues with packages changing under the feet of the running hook

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_keystone_hooks.py
51
51
    # keystone_utils
52
52
    'restart_map',
53
53
    'register_configs',
54
 
    'do_openstack_upgrade',
 
54
    'do_openstack_upgrade_reexec',
55
55
    'openstack_upgrade_available',
56
56
    'save_script_rc',
57
57
    'migrate_database',
467
467
        ensure_user.assert_called_with(user=self.ssh_user, group='keystone')
468
468
        get_homedir.assert_called_with(self.ssh_user)
469
469
 
470
 
        self.assertTrue(self.do_openstack_upgrade.called)
 
470
        self.assertTrue(self.do_openstack_upgrade_reexec.called)
471
471
 
472
472
        self.save_script_rc.assert_called_with()
473
473
        configure_https.assert_called_with()
538
538
        hooks.config_changed()
539
539
        self.git_install.assert_called_with(projects_yaml)
540
540
        self.assertFalse(self.openstack_upgrade_available.called)
541
 
        self.assertFalse(self.do_openstack_upgrade.called)
 
541
        self.assertFalse(self.do_openstack_upgrade_reexec.called)
542
542
 
543
543
    @patch.object(hooks, 'git_install_requested')
544
544
    @patch.object(hooks, 'config_value_changed')
569
569
 
570
570
        hooks.config_changed()
571
571
 
572
 
        self.assertFalse(self.do_openstack_upgrade.called)
 
572
        self.assertFalse(self.do_openstack_upgrade_reexec.called)
573
573
 
574
574
    @patch('keystone_utils.log')
575
575
    @patch('keystone_utils.ensure_ssl_cert_master')