diff options
| author | Michael Still <mikal@stillhq.com> | 2018-03-20 17:24:52 +1100 |
|---|---|---|
| committer | Matt Riedemann <mriedem.os@gmail.com> | 2018-05-15 10:09:01 -0400 |
| commit | e38caa2de0c4ac1762822286a4075c593d3eefb2 (patch) | |
| tree | f5ac813768228df4c54c2b6dac9f811dc093e745 /nova/tests/unit/virt/test_images.py | |
| parent | 7e2f459032e842cd7cd53622c9fdd3056480789a (diff) | |
| download | nova-e38caa2de0c4ac1762822286a4075c593d3eefb2.tar.gz | |
Move image conversion to privsep.
Following a similar pattern to previous changes, move calls to
qemu-img to convert between image formats to use privsep.
Change-Id: I2c3df909a783e1480d3ab4ca10b34b84ac9e4b5f
blueprint: hurrah-for-privsep
Diffstat (limited to 'nova/tests/unit/virt/test_images.py')
| -rw-r--r-- | nova/tests/unit/virt/test_images.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/tests/unit/virt/test_images.py b/nova/tests/unit/virt/test_images.py index c7ed95d859..1386f7a6c0 100644 --- a/nova/tests/unit/virt/test_images.py +++ b/nova/tests/unit/virt/test_images.py @@ -49,7 +49,7 @@ class QemuTestCase(test.NoDBTestCase): self.assertTrue(image_info) self.assertTrue(str(image_info)) - @mock.patch('nova.utils.supports_direct_io', return_value=True) + @mock.patch('nova.privsep.utils.supports_direct_io', return_value=True) @mock.patch.object(utils, 'execute', side_effect=processutils.ProcessExecutionError) def test_convert_image_with_errors(self, mocked_execute, mock_direct_io): @@ -101,8 +101,8 @@ class QemuTestCase(test.NoDBTestCase): images.fetch_to_raw, None, 'href123', '/no/path') - @mock.patch('nova.utils.supports_direct_io', return_value=True) - @mock.patch('nova.utils.execute') + @mock.patch('nova.privsep.utils.supports_direct_io', return_value=True) + @mock.patch('oslo_concurrency.processutils.execute') def test_convert_image_with_direct_io_support(self, mock_execute, mock_direct_io): images._convert_image('source', 'dest', 'in_format', 'out_format', @@ -111,8 +111,8 @@ class QemuTestCase(test.NoDBTestCase): '-f', 'in_format', 'source', 'dest') self.assertTupleEqual(expected, mock_execute.call_args[0]) - @mock.patch('nova.utils.supports_direct_io', return_value=False) - @mock.patch('nova.utils.execute') + @mock.patch('nova.privsep.utils.supports_direct_io', return_value=False) + @mock.patch('oslo_concurrency.processutils.execute') def test_convert_image_without_direct_io_support(self, mock_execute, mock_direct_io): images._convert_image('source', 'dest', 'in_format', 'out_format', |