openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Fixup test failure due to apache24 checks, add new test for apache24 configuration

Browse Source
This commit is contained in:
James Page
2013-10-15 14:01:37 +01:00
parent 4cbfbdacfe
commit a0ff7f5406
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
unit_tests/test_nova_cc_utils.py
View File

@@ -153,12 +153,24 @@ class NovaCCUtilsTests(CharmTestCase):
self.assertIn('nova-api-os-volume',
_map['/etc/nova/nova.conf']['services'])
def test_restart_map_api_before_frontends(self):
@patch('os.path.exists')
def test_restart_map_api_before_frontends(self, _exists):
_exists.return_value = False
self._resource_map(network_manager='neutron')
_map = utils.restart_map()
self.assertTrue(isinstance(_map, OrderedDict))
self.assertEquals(_map, RESTART_MAP)
@patch('os.path.exists')
def test_restart_map_apache24(self, _exists):
_exists.return_Value = True
self._resource_map(network_manager='neutron')
_map = utils.restart_map()
self.assertTrue('/etc/apache2/sites-available/'
'openstack_https_frontend.conf' in _map)
self.assertTrue('/etc/apache2/sites-available/'
'openstack_https_frontend' not in _map)
def test_determine_packages_quantum(self):
self._resource_map(network_manager='quantum')
pkgs = utils.determine_packages()