openstack/charm-cinder
Code Issues Proposed changes

Clean up a unit test a bit.

Browse Source
This commit is contained in:
Jason Hobbs 2015-07-22 14:16:31 -05:00
parent 13074a872d
commit 395cf28590
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
unit_tests/test_cinder_hooks.py
View File

@ -180,19 +180,16 @@ class TestChangedHooks(CharmTestCase):
@patch.object(hooks, 'git_install_requested') @patch.object(hooks, 'git_install_requested')
def test_config_changed_uses_remove_missing_force(self, git_requested, def test_config_changed_uses_remove_missing_force(self, git_requested,
conf_https): conf_https):
'It writes out all config' 'It uses the remove-missing-force config option'
git_requested.return_value = False git_requested.return_value = False
self.openstack_upgrade_available.return_value = False self.openstack_upgrade_available.return_value = False
self.test_config.set('block-device', 'sdb /dev/sdc sde') self.test_config.set('block-device', 'sdb')
self.test_config.set('volume-group', 'cinder-new')
self.test_config.set('overwrite', 'True')
self.test_config.set('remove-missing', True)
self.test_config.set('remove-missing-force', True) self.test_config.set('remove-missing-force', True)
hooks.hooks.execute(['hooks/config-changed']) hooks.hooks.execute(['hooks/config-changed'])
self.configure_lvm_storage.assert_called_with( self.configure_lvm_storage.assert_called_with(
['sdb', '/dev/sdc', 'sde'], ['sdb'],
'cinder-new', 'cinder-volumes',
True, True, True) False, False, True)
@patch.object(hooks, 'configure_https') @patch.object(hooks, 'configure_https')
@patch.object(hooks, 'git_install_requested') @patch.object(hooks, 'git_install_requested')