From 395cf2859035e8c51cf0ec513ebe877ca1892856 Mon Sep 17 00:00:00 2001 From: Jason Hobbs Date: Wed, 22 Jul 2015 14:16:31 -0500 Subject: [PATCH] Clean up a unit test a bit. --- unit_tests/test_cinder_hooks.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/unit_tests/test_cinder_hooks.py b/unit_tests/test_cinder_hooks.py index 8418885a..87859738 100644 --- a/unit_tests/test_cinder_hooks.py +++ b/unit_tests/test_cinder_hooks.py @@ -180,19 +180,16 @@ class TestChangedHooks(CharmTestCase): @patch.object(hooks, 'git_install_requested') def test_config_changed_uses_remove_missing_force(self, git_requested, conf_https): - 'It writes out all config' + 'It uses the remove-missing-force config option' git_requested.return_value = False self.openstack_upgrade_available.return_value = False - self.test_config.set('block-device', 'sdb /dev/sdc sde') - 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('block-device', 'sdb') self.test_config.set('remove-missing-force', True) hooks.hooks.execute(['hooks/config-changed']) self.configure_lvm_storage.assert_called_with( - ['sdb', '/dev/sdc', 'sde'], - 'cinder-new', - True, True, True) + ['sdb'], + 'cinder-volumes', + False, False, True) @patch.object(hooks, 'configure_https') @patch.object(hooks, 'git_install_requested')