openstack/nova
Code Issues Proposed changes

Merge "Database not needed for most cells messaging tests"

Browse Source
This commit is contained in:
Jenkins 2016-02-08 15:01:26 +00:00 committed by Gerrit Code Review
commit f6e2c33271
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
nova/tests/unit/cells/test_cells_messaging.py
View File

@ -48,7 +48,7 @@ CONF = cfg.CONF
CONF.import_opt('name', 'nova.cells.opts', group='cells') CONF.import_opt('name', 'nova.cells.opts', group='cells')
class CellsMessageClassesTestCase(test.TestCase): class CellsMessageClassesTestCase(test.NoDBTestCase):
"""Test case for the main Cells Message classes.""" """Test case for the main Cells Message classes."""
def setUp(self): def setUp(self):
super(CellsMessageClassesTestCase, self).setUp() super(CellsMessageClassesTestCase, self).setUp()
@ -647,7 +647,33 @@ class CellsMessageClassesTestCase(test.TestCase):
self.assertRaises(test.TestingException, response.value_or_raise) self.assertRaises(test.TestingException, response.value_or_raise)
class CellsTargetedMethodsTestCase(test.TestCase): class CellsTargetedMethodsWithDatabaseTestCase(test.TestCase):
"""These tests access the database unlike the others."""
def setUp(self):
super(CellsTargetedMethodsWithDatabaseTestCase, self).setUp()
fakes.init(self)
self.ctxt = context.RequestContext('fake', 'fake')
self._setup_attrs('api-cell', 'api-cell!child-cell2')
def _setup_attrs(self, source_cell, target_cell):
self.tgt_cell_name = target_cell
self.src_msg_runner = fakes.get_message_runner(source_cell)
def test_service_delete(self):
fake_service = dict(id=42, host='fake_host', binary='nova-compute',
topic='compute')
ctxt = self.ctxt.elevated()
db.service_create(ctxt, fake_service)
self.src_msg_runner.service_delete(
ctxt, self.tgt_cell_name, fake_service['id'])
self.assertRaises(exception.ServiceNotFound,
db.service_get, ctxt, fake_service['id'])
class CellsTargetedMethodsTestCase(test.NoDBTestCase):
"""Test case for _TargetedMessageMethods class. Most of these """Test case for _TargetedMessageMethods class. Most of these
tests actually test the full path from the MessageRunner through tests actually test the full path from the MessageRunner through
to the functionality of the message method. Hits 2 birds with 1 to the functionality of the message method. Hits 2 birds with 1
@ -864,18 +890,6 @@ class CellsTargetedMethodsTestCase(test.TestCase):
self.assertEqual(jsonutils.to_primitive(fake_service), self.assertEqual(jsonutils.to_primitive(fake_service),
jsonutils.to_primitive(result)) jsonutils.to_primitive(result))
def test_service_delete(self):
fake_service = dict(id=42, host='fake_host', binary='nova-compute',
topic='compute')
ctxt = self.ctxt.elevated()
db.service_create(ctxt, fake_service)
self.src_msg_runner.service_delete(
ctxt, self.tgt_cell_name, fake_service['id'])
self.assertRaises(exception.ServiceNotFound,
db.service_get, ctxt, fake_service['id'])
def test_proxy_rpc_to_manager_call(self): def test_proxy_rpc_to_manager_call(self):
fake_topic = 'fake-topic' fake_topic = 'fake-topic'
fake_rpc_message = {'method': 'fake_rpc_method', 'args': {}} fake_rpc_message = {'method': 'fake_rpc_method', 'args': {}}
@ -1408,7 +1422,7 @@ class CellsTargetedMethodsTestCase(test.TestCase):
{}, False) {}, False)
class CellsBroadcastMethodsTestCase(test.TestCase): class CellsBroadcastMethodsTestCase(test.NoDBTestCase):
"""Test case for _BroadcastMessageMethods class. Most of these """Test case for _BroadcastMessageMethods class. Most of these
tests actually test the full path from the MessageRunner through tests actually test the full path from the MessageRunner through
to the functionality of the message method. Hits 2 birds with 1 to the functionality of the message method. Hits 2 birds with 1
@ -2121,7 +2135,7 @@ class CellsBroadcastMethodsTestCase(test.TestCase):
self.assertEqual(fake_process.return_value, responses) self.assertEqual(fake_process.return_value, responses)
class CellsPublicInterfacesTestCase(test.TestCase): class CellsPublicInterfacesTestCase(test.NoDBTestCase):
"""Test case for the public interfaces into cells messaging.""" """Test case for the public interfaces into cells messaging."""
def setUp(self): def setUp(self):
super(CellsPublicInterfacesTestCase, self).setUp() super(CellsPublicInterfacesTestCase, self).setUp()