[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 5/6] iotests: prepare 030 for graph change
From: |
Andrey Shinkevich |
Subject: |
[Qemu-block] [PATCH v5 5/6] iotests: prepare 030 for graph change |
Date: |
Sun, 30 Dec 2018 23:09:16 +0300 |
The discard option for block-stream command requires insertion of the
filter to write into the backing chain. In that case, the job will not
resume by device name. So, the node name is specified.
Signed-off-by: Andrey Shinkevich <address@hidden>
---
tests/qemu-iotests/030 | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 276e06b..5d148b0 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -36,7 +36,8 @@ class TestSingleDrive(iotests.QMPTestCase):
qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' %
mid_img, test_img)
qemu_io('-f', 'raw', '-c', 'write -P 0x1 0 512', backing_img)
qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0x1 524288 512', mid_img)
- self.vm = iotests.VM().add_drive("blkdebug::" + test_img,
"backing.node-name=mid")
+ self.vm = iotests.VM().add_drive("blkdebug::" + test_img,
+ "node-name=source,backing.node-name=mid")
self.vm.launch()
def tearDown(self):
@@ -87,7 +88,7 @@ class TestSingleDrive(iotests.QMPTestCase):
self.assert_qmp(result, 'return', {})
self.pause_job('drive0', wait=False)
- self.vm.resume_drive('drive0')
+ self.vm.resume_drive('source')
self.pause_wait('drive0')
result = self.vm.qmp('query-block-jobs')
@@ -743,7 +744,8 @@ class TestStreamStop(iotests.QMPTestCase):
qemu_io('-f', 'raw', '-c', 'write -P 0x1 0 32M', backing_img)
qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' %
backing_img, test_img)
qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0x1 32M 32M', test_img)
- self.vm = iotests.VM().add_drive("blkdebug::" + test_img)
+ self.vm = iotests.VM().add_drive("blkdebug::" + test_img,
+ "node-name=source")
self.vm.launch()
def tearDown(self):
@@ -764,7 +766,7 @@ class TestStreamStop(iotests.QMPTestCase):
self.assert_qmp(e, 'event', 'JOB_STATUS_CHANGE')
self.assert_qmp(e, 'data/id', 'drive0')
- self.cancel_and_wait(resume=True)
+ self.cancel_and_wait(resume=True, resume_node='source')
class TestSetSpeed(iotests.QMPTestCase):
image_len = 80 * 1024 * 1024 # MB
@@ -774,7 +776,8 @@ class TestSetSpeed(iotests.QMPTestCase):
qemu_io('-f', 'raw', '-c', 'write -P 0x1 0 32M', backing_img)
qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' %
backing_img, test_img)
qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0x1 32M 32M', test_img)
- self.vm = iotests.VM().add_drive('blkdebug::' + test_img)
+ self.vm = iotests.VM().add_drive('blkdebug::' + test_img,
+ "node-name=source")
self.vm.launch()
def tearDown(self):
@@ -817,7 +820,7 @@ class TestSetSpeed(iotests.QMPTestCase):
self.assert_qmp(result, 'return[0]/device', 'drive0')
self.assert_qmp(result, 'return[0]/speed', 8 * 1024 * 1024)
- self.cancel_and_wait(resume=True)
+ self.cancel_and_wait(resume=True, resume_node='source')
self.vm.pause_drive('drive0')
# Check setting speed in block-stream works
@@ -828,7 +831,7 @@ class TestSetSpeed(iotests.QMPTestCase):
self.assert_qmp(result, 'return[0]/device', 'drive0')
self.assert_qmp(result, 'return[0]/speed', 4 * 1024 * 1024)
- self.cancel_and_wait(resume=True)
+ self.cancel_and_wait(resume=True, resume_node='source')
def test_set_speed_invalid(self):
self.assert_no_active_block_jobs()
@@ -845,7 +848,8 @@ class TestSetSpeed(iotests.QMPTestCase):
result = self.vm.qmp('block-job-set-speed', device='drive0', speed=-1)
self.assert_qmp(result, 'error/class', 'GenericError')
- self.cancel_and_wait(resume=True)
+ self.cancel_and_wait(resume=True, resume_node='source')
+
if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2', 'qed'])
--
1.8.3.1
- [Qemu-block] [PATCH v5 0/6] Discrad blocks during block-stream operation, Andrey Shinkevich, 2018/12/30
- [Qemu-block] [PATCH v5 4/6] iotests: allow resume_drive by node name, Andrey Shinkevich, 2018/12/30
- [Qemu-block] [PATCH v5 2/6] Discard blocks while copy-on-read, Andrey Shinkevich, 2018/12/30
- [Qemu-block] [PATCH v5 5/6] iotests: prepare 030 for graph change,
Andrey Shinkevich <=
- [Qemu-block] [PATCH v5 1/6] Stream block job involves copy-on-read filter driver, Andrey Shinkevich, 2018/12/30
- [Qemu-block] [PATCH v5 3/6] The discard flag for block stream operation, Andrey Shinkevich, 2018/12/30
- [Qemu-block] [PATCH v5 6/6] iotests: 030 with block-stream discard, Andrey Shinkevich, 2018/12/30