Merge "Revert "Simplify how ephemeral disks are created and named.""

This commit is contained in:
Jenkins
2012-12-11 20:46:52 +00:00
committed by Gerrit Code Review

View File

@@ -2318,9 +2318,6 @@ class LibvirtConnTestCase(test.TestCase):
self.stubs.Set(imagebackend.Image, self.stubs.Set(imagebackend.Image,
'cache', 'cache',
fake_none) fake_none)
self.stubs.Set(libvirt_driver.LibvirtDriver,
'_create_ephemeral',
fake_none)
conn.spawn(self.context, instance, None, [], 'herp', conn.spawn(self.context, instance, None, [], 'herp',
network_info=network_info) network_info=network_info)