openstack/charm-neutron-gateway
Code Issues Proposed changes

Allow teardown of the status_set patch by using with statements for patches

Browse Source
This commit is contained in:
David Ames 2015-10-08 09:16:22 -07:00
parent 286af8dc56
commit 95dce3a57b
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unit_tests/test_actions_git_reinstall.py
View File

@ -15,7 +15,8 @@ _restart_map = utils.restart_map
utils.register_configs = MagicMock()
utils.restart_map = MagicMock()
import git_reinstall
with patch('charmhelpers.core.hookenv.status_set'):
import git_reinstall
# Unpatch it now that its loaded.
utils.register_configs = _register_configs

5
unit_tests/test_actions_openstack_upgrade.py
View File

@ -7,8 +7,9 @@ from test_utils import (
os.environ['JUJU_UNIT_NAME'] = 'neutron-gateway'
with patch('neutron_utils.register_configs') as register_configs:
import openstack_upgrade
with patch('charmhelpers.core.hookenv.status_set'):
with patch('neutron_utils.register_configs') as register_configs:
import openstack_upgrade
TO_PATCH = [
'do_openstack_upgrade',

5
unit_tests/test_neutron_hooks.py
View File

@ -7,7 +7,10 @@ _register_configs = utils.register_configs
_restart_map = utils.restart_map
utils.register_configs = MagicMock()
utils.restart_map = MagicMock()
import neutron_hooks as hooks
with patch('charmhelpers.core.hookenv.status_set'):
import neutron_hooks as hooks
utils.register_configs = _register_configs
utils.restart_map = _restart_map

3
unit_tests/test_utils.py
View File

@ -5,9 +5,6 @@ import yaml
from mock import patch
patch('charmhelpers.contrib.openstack.utils.set_os_workload_status').start()
patch('charmhelpers.core.hookenv.status_set').start()
def load_config():
'''