[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 29/35] iotests/222: constantly use single quotes for strings
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v4 29/35] iotests/222: constantly use single quotes for strings |
Date: |
Wed, 2 Jun 2021 16:11:02 +0300 |
The file use both single and double quotes for strings. Let's be
consistent.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/222 | 68 +++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222
index 5e2556f8df..799369e290 100755
--- a/tests/qemu-iotests/222
+++ b/tests/qemu-iotests/222
@@ -30,23 +30,23 @@ iotests.script_initialize(
supported_platforms=['linux'],
)
-patterns = [("0x5d", "0", "64k"),
- ("0xd5", "1M", "64k"),
- ("0xdc", "32M", "64k"),
- ("0xcd", "0x3ff0000", "64k")] # 64M - 64K
+patterns = [('0x5d', '0', '64k'),
+ ('0xd5', '1M', '64k'),
+ ('0xdc', '32M', '64k'),
+ ('0xcd', '0x3ff0000', '64k')] # 64M - 64K
-overwrite = [("0xab", "0", "64k"), # Full overwrite
- ("0xad", "0x00f8000", "64k"), # Partial-left (1M-32K)
- ("0x1d", "0x2008000", "64k"), # Partial-right (32M+32K)
- ("0xea", "0x3fe0000", "64k")] # Adjacent-left (64M - 128K)
+overwrite = [('0xab', '0', '64k'), # Full overwrite
+ ('0xad', '0x00f8000', '64k'), # Partial-left (1M-32K)
+ ('0x1d', '0x2008000', '64k'), # Partial-right (32M+32K)
+ ('0xea', '0x3fe0000', '64k')] # Adjacent-left (64M - 128K)
-zeroes = [("0", "0x00f8000", "32k"), # Left-end of partial-left (1M-32K)
- ("0", "0x2010000", "32k"), # Right-end of partial-right (32M+64K)
- ("0", "0x3fe0000", "64k")] # overwrite[3]
+zeroes = [('0', '0x00f8000', '32k'), # Left-end of partial-left (1M-32K)
+ ('0', '0x2010000', '32k'), # Right-end of partial-right (32M+64K)
+ ('0', '0x3fe0000', '64k')] # overwrite[3]
-remainder = [("0xd5", "0x108000", "32k"), # Right-end of partial-left [1]
- ("0xdc", "32M", "32k"), # Left-end of partial-right [2]
- ("0xcd", "0x3ff0000", "64k")] # patterns[3]
+remainder = [('0xd5', '0x108000', '32k'), # Right-end of partial-left [1]
+ ('0xdc', '32M', '32k'), # Left-end of partial-right [2]
+ ('0xcd', '0x3ff0000', '64k')] # patterns[3]
with iotests.FilePath('base.img') as base_img_path, \
iotests.FilePath('fleece.img') as fleece_img_path, \
@@ -58,7 +58,7 @@ with iotests.FilePath('base.img') as base_img_path, \
log('')
assert qemu_img('create', '-f', iotests.imgfmt, base_img_path, '64M') == 0
- assert qemu_img('create', '-f', "qcow2", fleece_img_path, '64M') == 0
+ assert qemu_img('create', '-f', 'qcow2', fleece_img_path, '64M') == 0
for p in patterns:
qemu_io('-f', iotests.imgfmt,
@@ -78,43 +78,43 @@ with iotests.FilePath('base.img') as base_img_path, \
log('--- Setting up Fleecing Graph ---')
log('')
- src_node = "drive0"
- tgt_node = "fleeceNode"
+ src_node = 'drive0'
+ tgt_node = 'fleeceNode'
# create tgt_node backed by src_node
- log(vm.qmp("blockdev-add", {
- "driver": "qcow2",
- "node-name": tgt_node,
- "file": {
- "driver": "file",
- "filename": fleece_img_path,
+ log(vm.qmp('blockdev-add', {
+ 'driver': 'qcow2',
+ 'node-name': tgt_node,
+ 'file': {
+ 'driver': 'file',
+ 'filename': fleece_img_path,
},
- "backing": src_node,
+ 'backing': src_node,
}))
# Establish COW from source to fleecing node
- log(vm.qmp("blockdev-backup",
+ log(vm.qmp('blockdev-backup',
device=src_node,
target=tgt_node,
- sync="none"))
+ sync='none'))
log('')
log('--- Setting up NBD Export ---')
log('')
nbd_uri = 'nbd+unix:///%s?socket=%s' % (tgt_node, nbd_sock_path)
- log(vm.qmp("nbd-server-start",
- {"addr": { "type": "unix",
- "data": { "path": nbd_sock_path } } }))
+ log(vm.qmp('nbd-server-start',
+ {'addr': { 'type': 'unix',
+ 'data': { 'path': nbd_sock_path } } }))
- log(vm.qmp("nbd-server-add", device=tgt_node))
+ log(vm.qmp('nbd-server-add', device=tgt_node))
log('')
log('--- Sanity Check ---')
log('')
for p in patterns + zeroes:
- cmd = "read -P%s %s %s" % p
+ cmd = 'read -P%s %s %s' % p
log(cmd)
assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0
@@ -123,7 +123,7 @@ with iotests.FilePath('base.img') as base_img_path, \
log('')
for p in overwrite:
- cmd = "write -P%s %s %s" % p
+ cmd = 'write -P%s %s %s' % p
log(cmd)
log(vm.hmp_qemu_io(src_node, cmd))
@@ -132,7 +132,7 @@ with iotests.FilePath('base.img') as base_img_path, \
log('')
for p in patterns + zeroes:
- cmd = "read -P%s %s %s" % p
+ cmd = 'read -P%s %s %s' % p
log(cmd)
assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0
@@ -153,7 +153,7 @@ with iotests.FilePath('base.img') as base_img_path, \
log('')
for p in overwrite + remainder:
- cmd = "read -P%s %s %s" % p
+ cmd = 'read -P%s %s %s' % p
log(cmd)
assert qemu_io_silent(base_img_path, '-c', cmd) == 0
--
2.29.2
- [PATCH v4 10/35] block/backup: set copy_range and compress after filter insertion, (continued)
- [PATCH v4 10/35] block/backup: set copy_range and compress after filter insertion, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 18/35] block/copy-before-write: cbw_init(): use file child after attaching, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 11/35] block/backup: move cluster size calculation to block-copy, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 19/35] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 28/35] iotests/222: fix pylint and mypy complains, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 21/35] block/copy-before-write: initialize block-copy bitmap, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 23/35] block/copy-before-write: make public block driver, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 24/35] qapi: publish copy-before-write filter, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 20/35] block/copy-before-write: cbw_init(): use options, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 22/35] block/block-copy: make setting progress optional, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 29/35] iotests/222: constantly use single quotes for strings,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v4 26/35] python/qemu/machine: QEMUMachine: improve qmp() method, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 25/35] python/qemu/machine.py: refactor _qemu_args(), Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 27/35] iotests.py: VM: add own __enter__ method, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 30/35] iotests: move 222 to tests/image-fleecing, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 32/35] iotests/image-fleecing: proper source device, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 33/35] iotests/image-fleecing: rename tgt_node, Vladimir Sementsov-Ogievskiy, 2021/06/02
- [PATCH v4 31/35] iotests.py: hmp_qemu_io: support qdev, Vladimir Sementsov-Ogievskiy, 2021/06/02