openstack
/
charm-cinder-ceph
Code Issues Proposed changes

Fix unit tests

This commit is contained in:
Liam Young 2015-09-07 09:36:20 +01:00
parent 04d5b68be2
commit 88650e76aa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/cinder_hooks.py
View File

@ -28,7 +28,7 @@ from charmhelpers.core.host import (
)
from charmhelpers.contrib.storage.linux.ceph import (
send_request_if_needed,
request_complete,
is_request_complete,
ensure_ceph_keyring,
CephBrokerRq,
delete_keyring,
@ -74,7 +74,7 @@ def ceph_changed():
log('Could not create ceph keyring: peer not ready?')
return
if request_complete(get_ceph_request()):
if is_request_complete(get_ceph_request()):
log('Request complete')
CONFIGS.write_all()
set_ceph_env_variables(service=service)

8
unit_tests/test_cinder_hooks.py
View File

@ -18,7 +18,7 @@ TO_PATCH = [
'register_configs',
'restart_map',
'set_ceph_env_variables',
'request_complete',
'is_request_complete',
'send_request_if_needed',
'CONFIGS',
# charmhelpers.core.hookenv
@ -70,7 +70,7 @@ class TestCinderHooks(CharmTestCase):
@patch('charmhelpers.core.hookenv.config')
def test_ceph_changed(self, mock_config):
'''It ensures ceph assets created on ceph changed'''
self.request_complete.return_value = True
self.is_request_complete.return_value = True
self.CONFIGS.complete_contexts.return_value = ['ceph']
self.service_name.return_value = 'cinder'
self.ensure_ceph_keyring.return_value = True
@ -86,7 +86,7 @@ class TestCinderHooks(CharmTestCase):
def test_ceph_changed_newrq(self, mock_config, mock_get_ceph_request):
'''It ensures ceph assets created on ceph changed'''
mock_get_ceph_request.return_value = 'cephreq'
self.request_complete.return_value = False
self.is_request_complete.return_value = False
self.CONFIGS.complete_contexts.return_value = ['ceph']
self.service_name.return_value = 'cinder'
self.ensure_ceph_keyring.return_value = True
@ -101,7 +101,7 @@ class TestCinderHooks(CharmTestCase):
'''It ensures ceph assets created on ceph changed'''
self.CONFIGS.complete_contexts.return_value = ['ceph']
self.service_name.return_value = 'cinder'
self.request_complete.return_value = True
self.is_request_complete.return_value = True
self.ensure_ceph_keyring.return_value = False
hooks.hooks.execute(['hooks/ceph-relation-changed'])
# NOTE(jamespage): If ensure_ceph keyring fails, then