summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-13 21:58:40 +0000
committerGerrit Code Review <review@openstack.org>2012-08-13 21:58:40 +0000
commit09f24242a3e1fbd7171becda298f643d6b645223 (patch)
tree4206d83ffe0762919b4a081f71f36e6765febc3d /nova/tests
parent6a848df4004c0c977320ba34bf735106505d7353 (diff)
parentf72f3498656e8b4857001a1f3d194305245d56ba (diff)
Merge "Fix rpc error with live_migration."
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/scheduler/test_rpcapi.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py
index 109ff36a3..1fbc06390 100644
--- a/nova/tests/scheduler/test_rpcapi.py
+++ b/nova/tests/scheduler/test_rpcapi.py
@@ -95,7 +95,7 @@ class SchedulerRpcAPITestCase(test.TestCase):
self._test_scheduler_api('live_migration', rpc_method='call',
block_migration='fake_block_migration',
disk_over_commit='fake_disk_over_commit',
- instance='fake_instance', dest='fake_dest', topic='fake_topic',
+ instance='fake_instance', dest='fake_dest',
version='1.3')
def test_update_service_capabilities(self):