summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-06 20:32:32 +0000
committerGerrit Code Review <review@openstack.org>2012-08-06 20:32:32 +0000
commitfb0e657e5fea5760320022e1aca004fa2930a1df (patch)
tree514af93b673afc6ab29c6f7e2e5447ed63f8bbb3 /nova
parent260e406f0f5a97962d4bde3998c272864365e0e7 (diff)
parent72670a93ccd802e9e117aa754107440697148c78 (diff)
Merge "Fix test_resize_xcp testcase - it never ran"
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/test_xenapi.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index f858fed25..cfabe85c9 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -987,18 +987,18 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase):
{'uuid': vdi_uuid, 'ref': vdi_ref})
self.assertEqual(called['resize'], True)
- def test_resize_xcp(self):
- instance = db.instance_create(self.context, self.instance_values)
- called = {'resize': False}
-
- def fake_vdi_resize(*args, **kwargs):
- called['resize'] = True
-
- self.stubs.Set(stubs.FakeSessionForVMTests,
- "VDI_resize", fake_vdi_resize)
- stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests,
- product_version=(1, 4, 99),
- product_brand='XCP')
+ def test_resize_xcp(self):
+ instance = db.instance_create(self.context, self.instance_values)
+ called = {'resize': False}
+
+ def fake_vdi_resize(*args, **kwargs):
+ called['resize'] = True
+
+ self.stubs.Set(stubs.FakeSessionForVMTests,
+ "VDI_resize", fake_vdi_resize)
+ stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests,
+ product_version=(1, 4, 99),
+ product_brand='XCP')
conn = xenapi_conn.XenAPIDriver(False)
vdi_ref = xenapi_fake.create_vdi('hurr', 'fake')
vdi_uuid = xenapi_fake.get_record('VDI', vdi_ref)['uuid']