Fix lint and unit tests

This commit is contained in:
Liam Young 2015-05-06 10:15:15 +01:00
parent 20de56e9e5
commit 5e524cf6f0
2 changed files with 6 additions and 3 deletions

View File

@ -339,7 +339,8 @@ class TestQuantumHooks(CharmTestCase):
def test_neutron_plugin_changed(self):
self.use_l3ha.return_value = True
self._call_hook('neutron-plugin-api-relation-changed')
self.apt_install.assert_called_with(['keepalived'], fatal=True)
self.apt_install.assert_called_with(['keepalived', 'conntrack'],
fatal=True)
self.assertTrue(self.CONFIGS.write_all.called)
def test_cluster_departed_nvp(self):

View File

@ -929,8 +929,10 @@ class TestQuantumAgentReallocation(CharmTestCase):
'start_dir': '/var/lib/neutron',
'process_name': 'neutron-nvsd-agent',
'executable_name': '/usr/local/bin/neutron-nvsd-agent',
'config_files': ['/etc/neutron/neutron.conf',
'/etc/neutron/plugins/oneconvergence/nvsdplugin.ini'],
'config_files': [
'/etc/neutron/neutron.conf',
'/etc/neutron/plugins/oneconvergence/nvsdplugin.ini'
],
'log_file': '/var/log/neutron/nvsd-agent.log',
}
neutron_plugin_openflow_context = {