mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests: Prefer null-co over null-aio

Browse Source 
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 <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 20190917092004.999-2-mreitz@redhat.com
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2019-09-17 11:19:58 +02:00
parent 187f355121
commit a6f8f9f82c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/qemu-iotests/093
View File

@ -267,13 +267,12 @@ class ThrottleTestCoroutine(ThrottleTestCase):
test_img = "null-co://" test_img = "null-co://"
class ThrottleTestGroupNames(iotests.QMPTestCase): class ThrottleTestGroupNames(iotests.QMPTestCase):
test_img = "null-aio://"
max_drives = 3 max_drives = 3
def setUp(self): def setUp(self):
self.vm = iotests.VM() self.vm = iotests.VM()
for i in range(0, self.max_drives): 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") "throttling.iops-total=100,file.read-zeroes=on")
self.vm.launch() self.vm.launch()
@ -376,10 +375,10 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
def test_removable_media(self): def test_removable_media(self):
# Add a couple of dummy nodes named cd0 and cd1 # 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") read_zeroes=True, node_name="cd0")
self.assert_qmp(result, 'return', {}) 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") read_zeroes=True, node_name="cd1")
self.assert_qmp(result, 'return', {}) self.assert_qmp(result, 'return', {})

2
tests/qemu-iotests/245
View File

@ -598,7 +598,7 @@ class TestBlockdevReopen(iotests.QMPTestCase):
################## ##################
###### null ###### ###### 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) result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)
self.assert_qmp(result, 'return', {}) self.assert_qmp(result, 'return', {})