x
/
charm-plumgrid-gateway
Code Issues Proposed changes

Changes to unit_tests

This commit is contained in:
Bilal Baqar 2015-08-09 08:52:23 -07:00
parent b3634f698c
commit 161417c062
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unit_tests/test_pg_gw_hooks.py
View File

@ -54,8 +54,7 @@ class PGGwHooksTests(CharmTestCase):
self.configure_sources.assert_called_with(update=True)
self.apt_install.assert_has_calls([
call(_pkgs, fatal=True,
options=['--force-yes',
'--option=Dpkg::Options::=--force-confold']),
options=['--force-yes']),
])
self.load_iovisor.assert_called_with()
self.ensure_mtu.assert_called_with()
@ -78,8 +77,7 @@ class PGGwHooksTests(CharmTestCase):
self.configure_sources.assert_called_with(update=True)
self.apt_install.assert_has_calls([
call(_pkgs, fatal=True,
options=['--force-yes',
'--option=Dpkg::Options::=--force-confold']),
options=['--force-yes']),
])
self.load_iovisor.assert_called_with()
self.ensure_mtu.assert_called_with()

12
unit_tests/test_pg_gw_utils.py
View File

@ -50,11 +50,10 @@ class TestPGGwUtils(CharmTestCase):
self.os_release.return_value = 'trusty'
templating.OSConfigRenderer.side_effect = _mock_OSConfigRenderer
_regconfs = nutils.register_configs()
confs = ['/var/lib/libvirt/filesystems/plumgrid/opt/pg/etc/plumgrid.conf',
confs = ['/var/lib/libvirt/filesystems/plumgrid-data/conf/pg/plumgrid.conf',
'/var/lib/libvirt/filesystems/plumgrid-data/conf/etc/hostname',
'/var/lib/libvirt/filesystems/plumgrid-data/conf/etc/hosts',
'/var/lib/libvirt/filesystems/plumgrid-data/conf/pg/ifcs.conf',
'/etc/nova/rootwrap.d/network.filters']
'/var/lib/libvirt/filesystems/plumgrid-data/conf/pg/ifcs.conf']
self.assertItemsEqual(_regconfs.configs, confs)
def test_resource_map(self):
@ -68,10 +67,9 @@ class TestPGGwUtils(CharmTestCase):
_restart_map = nutils.restart_map()
expect = OrderedDict([
(nutils.PG_CONF, ['plumgrid']),
(nutils.PGHN_CONF, ['plumgrid']),
(nutils.PGHS_CONF, ['plumgrid']),
(nutils.PGIFCS_CONF, []),
(nutils.FILTERS_CONF, []),
(nutils.PG_HN_CONF, ['plumgrid']),
(nutils.PG_HS_CONF, ['plumgrid']),
(nutils.PG_IFCS_CONF, []),
])
self.assertEqual(expect, _restart_map)
for item in _restart_map: