Skip to content

Commit

Permalink
block: Remove inner quotation marks in iotest 085
Browse files Browse the repository at this point in the history
This patch removes the inner quotation marks in all cases like this:

   cmd=" ... "${variable}" ... "

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
bertogg authored and kevmw committed Nov 11, 2015
1 parent 08b24cf commit f2d7f16
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions tests/qemu-iotests/085
Expand Up @@ -65,7 +65,7 @@ function create_single_snapshot()
{
cmd="{ 'execute': 'blockdev-snapshot-sync',
'arguments': { 'device': 'virtio0',
'snapshot-file':'"${TEST_DIR}/${1}-${snapshot_virt0}"',
'snapshot-file':'${TEST_DIR}/${1}-${snapshot_virt0}',
'format': 'qcow2' } }"
_send_qemu_cmd $h "${cmd}" "return"
}
Expand All @@ -77,10 +77,10 @@ function create_group_snapshot()
{'actions': [
{ 'type': 'blockdev-snapshot-sync', 'data' :
{ 'device': 'virtio0',
'snapshot-file': '"${TEST_DIR}/${1}-${snapshot_virt0}"' } },
'snapshot-file': '${TEST_DIR}/${1}-${snapshot_virt0}' } },
{ 'type': 'blockdev-snapshot-sync', 'data' :
{ 'device': 'virtio1',
'snapshot-file': '"${TEST_DIR}/${1}-${snapshot_virt1}"' } } ]
'snapshot-file': '${TEST_DIR}/${1}-${snapshot_virt1}' } } ]
} }"

_send_qemu_cmd $h "${cmd}" "return"
Expand All @@ -101,9 +101,9 @@ function add_snapshot_image()
mv "${TEST_IMG}" "${snapshot_file}"
cmd="{ 'execute': 'blockdev-add', 'arguments':
{ 'options':
{ 'driver': 'qcow2', 'node-name': 'snap_"${1}"', "${extra_params}"
{ 'driver': 'qcow2', 'node-name': 'snap_${1}', ${extra_params}
'file':
{ 'driver': 'file', 'filename': '"${snapshot_file}"' } } } }"
{ 'driver': 'file', 'filename': '${snapshot_file}' } } } }"
_send_qemu_cmd $h "${cmd}" "return"
}

Expand All @@ -113,7 +113,7 @@ function blockdev_snapshot()
{
cmd="{ 'execute': 'blockdev-snapshot',
'arguments': { 'node': 'virtio0',
'overlay':'snap_"${1}"' } }"
'overlay':'snap_${1}' } }"
_send_qemu_cmd $h "${cmd}" "${2:-return}"
}

Expand Down Expand Up @@ -152,7 +152,7 @@ echo === Invalid command - missing device and nodename ===
echo

_send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot-sync',
'arguments': { 'snapshot-file':'"${TEST_DIR}/1-${snapshot_virt0}"',
'arguments': { 'snapshot-file':'${TEST_DIR}/1-${snapshot_virt0}',
'format': 'qcow2' } }" "error"

echo
Expand Down Expand Up @@ -224,7 +224,7 @@ blockdev_snapshot $((${SNAPSHOTS}+1)) error

_send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot',
'arguments': { 'node':'nodevice',
'overlay':'snap_"${SNAPSHOTS}"' }
'overlay':'snap_${SNAPSHOTS}' }
}" "error"

# success, all done
Expand Down

0 comments on commit f2d7f16

Please sign in to comment.