summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-20 00:55:09 +0000
committerGerrit Code Review <review@openstack.org>2012-11-20 00:55:09 +0000
commitf5119ca582e5fd5f42ab32a765352314aa5ae28b (patch)
tree4502dedacd8573ee8ebf8d7286b1f405ea8cfcf6 /nova/tests
parent534af0d2002ff80dfb9c66254b2289350b79718c (diff)
parent3349417edfd86d995b144588059aa1c8d8e25a9d (diff)
Merge "Pass rpc connection to pre_start_hook."
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_service.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index a1a28d05a..eef2d23e0 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -159,7 +159,7 @@ class ServiceTestCase(test.TestCase):
self._service_start_mocks()
# pre_start_hook is called after service record is created,
# but before RPC consumer is created
- self.manager_mock.pre_start_hook()
+ self.manager_mock.pre_start_hook(rpc_connection=mox.IgnoreArg())
self.manager_mock.create_rpc_dispatcher()
# post_start_hook is called after RPC consumer is created.
self.manager_mock.post_start_hook()