openstack
/
nova
Code Issues Proposed changes

Stop using mox from virt/libvirt/storage/test_lvm.py 

Replaced stubs.Set() with stub_out() in
nova/tests/unit/virt/libvirt/storage/test_lvm.py

Part of blueprint remove-mox-newton

Change-Id: I086bd52837636180e9fb98fdd0e0695c4a8db861
This commit is contained in:
Dao Cong Tien 2016-06-01 15:46:49 +07:00
parent ced89e7b26
commit 484fffe8f1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/unit/virt/libvirt/storage/test_lvm.py
View File

@ -35,10 +35,10 @@ class LvmTestCase(test.NoDBTestCase):
return 123456789, None
expected_commands = [('blockdev', '--getsize64', '/dev/foo')]
self.stubs.Set(utils, 'execute', fake_execute)
self.stub_out('nova.utils.execute', fake_execute)
size = lvm.get_volume_size('/dev/foo')
self.assertEqual(expected_commands, executes)
self.assertEqual(size, 123456789)
self.assertEqual(123456789, size)
@mock.patch.object(utils, 'execute',
side_effect=processutils.ProcessExecutionError(
@ -72,8 +72,9 @@ class LvmTestCase(test.NoDBTestCase):
def fake_execute(*cmd, **kwargs):
executes.append(cmd)
self.stubs.Set(lvm, 'get_volume_size', fake_lvm_size)
self.stubs.Set(utils, 'execute', fake_execute)
self.stub_out('nova.virt.libvirt.storage.lvm.get_volume_size',
fake_lvm_size)
self.stub_out('nova.utils.execute', fake_execute)
# Test the correct dd commands are run for various sizes
lvm_size = 1