summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-04 01:45:09 +0000
committerGerrit Code Review <review@openstack.org>2012-09-04 01:45:09 +0000
commitaa831756ac976187928398c8591768e97bda8c39 (patch)
treee1e401adc6a6eafdf6ed0195c090913959d227be /nova/tests
parent99bc7c2858e473833a778191b11fc66c71201cfe (diff)
parentc813af2d7f441ac5e8506a5df2db256ebacbe875 (diff)
Merge "Fix vmwareapi driver spawn() signature"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_vmwareapi.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py
index 7b9ad38e5..aa28f2762 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/test_vmwareapi.py
@@ -102,7 +102,9 @@ class VMWareAPIVMTestCase(test.TestCase):
self._create_instance_in_the_db()
self.type_data = db.instance_type_get_by_name(None, 'm1.large')
self.conn.spawn(self.context, self.instance, self.image,
- self.network_info)
+ injected_files=[], admin_password=None,
+ network_info=self.network_info,
+ block_device_info=None)
self._check_vm_record()
def _check_vm_record(self):