On 19.08.19 22:18, Max Reitz wrote: > We use null-co basically everywhere in the iotests. Unless we want to > test null-aio specifically, we should use it instead (for consistency). > > Signed-off-by: Max Reitz <mre...@redhat.com> > Reviewed-by: John Snow <js...@redhat.com>
Hm, sorry, I just noticed that I probably should have dropped this R-b. :-/
(I mean, apart from the rebase conflict, nothing has changed, but still.)
Max
> ---
> tests/qemu-iotests/093 | 7 +++----
> tests/qemu-iotests/245 | 2 +-
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093
> index 3c4f5173ce..50c1e7f2ec 100755
> --- a/tests/qemu-iotests/093
> +++ b/tests/qemu-iotests/093
> @@ -267,13 +267,12 @@ class ThrottleTestCoroutine(ThrottleTestCase):
> test_img = "null-co://"
>
> class ThrottleTestGroupNames(iotests.QMPTestCase):
> - test_img = "null-aio://"
> max_drives = 3
>
> def setUp(self):
> self.vm = iotests.VM()
> for i in range(0, self.max_drives):
> - self.vm.add_drive(self.test_img,
> + self.vm.add_drive("null-co://",
>
> "throttling.iops-total=100,file.read-zeroes=on")
> self.vm.launch()
>
> @@ -376,10 +375,10 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
>
> def test_removable_media(self):
> # Add a couple of dummy nodes named cd0 and cd1
> - result = self.vm.qmp("blockdev-add", driver="null-aio",
> + result = self.vm.qmp("blockdev-add", driver="null-co",
> read_zeroes=True, node_name="cd0")
> self.assert_qmp(result, 'return', {})
> - result = self.vm.qmp("blockdev-add", driver="null-aio",
> + result = self.vm.qmp("blockdev-add", driver="null-co",
> read_zeroes=True, node_name="cd1")
> self.assert_qmp(result, 'return', {})
>
> diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245
> index bc1ceb9792..ae169778b0 100644
> --- a/tests/qemu-iotests/245
> +++ b/tests/qemu-iotests/245
> @@ -598,7 +598,7 @@ class TestBlockdevReopen(iotests.QMPTestCase):
> ##################
> ###### null ######
> ##################
> - opts = {'driver': 'null-aio', 'node-name': 'root', 'size': 1024}
> + opts = {'driver': 'null-co', 'node-name': 'root', 'size': 1024}
>
> result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)
> self.assert_qmp(result, 'return', {})
>
signature.asc
Description: OpenPGP digital signature
