openstack/aodh
Code Issues Proposed changes

Merge "Replace mox with mock in tests.network"

Browse Source
This commit is contained in:
Jenkins 2013-11-12 14:48:56 +00:00 committed by Gerrit Code Review
commit 61ac97dc2a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/network/test_floatingip.py
View File

@ -24,10 +24,8 @@ import mock
from ceilometer.central import manager from ceilometer.central import manager
from ceilometer.network import floatingip from ceilometer.network import floatingip
from ceilometer import nova_client
from ceilometer.openstack.common import context from ceilometer.openstack.common import context
from ceilometer.openstack.common import test from ceilometer.openstack.common import test
from ceilometer.openstack.common.fixture import moxstubout
class TestFloatingIPPollster(test.BaseTestCase): class TestFloatingIPPollster(test.BaseTestCase):
@ -35,15 +33,18 @@ class TestFloatingIPPollster(test.BaseTestCase):
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def setUp(self): def setUp(self):
super(TestFloatingIPPollster, self).setUp() super(TestFloatingIPPollster, self).setUp()
self.stubs = self.useFixture(moxstubout.MoxStubout()).stubs self.addCleanup(mock.patch.stopall)
self.context = context.get_admin_context() self.context = context.get_admin_context()
self.manager = manager.AgentManager() self.manager = manager.AgentManager()
self.pollster = floatingip.FloatingIPPollster() self.pollster = floatingip.FloatingIPPollster()
self.stubs.Set(nova_client.Client, 'floating_ip_get_all', fake_ips = self.fake_get_ips()
self.faux_get_ips) patch_virt = mock.patch('ceilometer.nova_client.Client.'
'floating_ip_get_all',
return_value=fake_ips)
patch_virt.start()
@staticmethod @staticmethod
def faux_get_ips(self): def fake_get_ips():
ips = [] ips = []
for i in range(1, 4): for i in range(1, 4):
ip = mock.MagicMock() ip = mock.MagicMock()
@ -90,6 +91,6 @@ class TestFloatingIPPollster(test.BaseTestCase):
def test_get_samples_cached(self): def test_get_samples_cached(self):
cache = {} cache = {}
cache['floating_ips'] = self.faux_get_ips(None)[:2] cache['floating_ips'] = self.fake_get_ips()[:2]
samples = list(self.pollster.get_samples(self.manager, cache)) samples = list(self.pollster.get_samples(self.manager, cache))
self.assertEqual(len(samples), 2) self.assertEqual(len(samples), 2)