All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 099/100] iotests: Add test for colon handling
Date: Fri,  7 Jul 2017 19:08:54 +0200	[thread overview]
Message-ID: <1499447335-6125-100-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1499447335-6125-1-git-send-email-kwolf@redhat.com>

From: Max Reitz <mreitz@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20170702150510.23276-3-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/126     | 105 +++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/126.out |  23 ++++++++++
 tests/qemu-iotests/group   |   1 +
 3 files changed, 129 insertions(+)
 create mode 100755 tests/qemu-iotests/126
 create mode 100644 tests/qemu-iotests/126.out

diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
new file mode 100755
index 0000000..a2d4d6c
--- /dev/null
+++ b/tests/qemu-iotests/126
@@ -0,0 +1,105 @@
+#!/bin/bash
+#
+# Tests handling of colons in filenames (which may be confused with protocol
+# prefixes)
+#
+# Copyright (C) 2017 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# creator
+owner=mreitz@redhat.com
+
+seq="$(basename $0)"
+echo "QA output created by $seq"
+
+here="$PWD"
+status=1	# failure is the default!
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+# Needs backing file support
+_supported_fmt qcow qcow2 qed vmdk
+# This is the default protocol (and we want to test the difference between
+# colons which separate a protocol prefix from the rest and colons which are
+# just part of the filename, so we cannot test protocols which require a prefix)
+_supported_proto file
+_supported_os Linux
+
+echo
+echo '=== Testing plain files ==='
+echo
+
+# A colon after a slash is not a protocol prefix separator
+TEST_IMG="$TEST_DIR/a:b.$IMGFMT" _make_test_img 64M
+_rm_test_img "$TEST_DIR/a:b.$IMGFMT"
+
+# But if you want to be really sure, you can do this
+TEST_IMG="file:$TEST_DIR/a:b.$IMGFMT" _make_test_img 64M
+_rm_test_img "$TEST_DIR/a:b.$IMGFMT"
+
+
+echo
+echo '=== Testing relative backing filename resolution ==='
+echo
+
+BASE_IMG="$TEST_DIR/image:base.$IMGFMT"
+TOP_IMG="$TEST_DIR/image:top.$IMGFMT"
+
+TEST_IMG=$BASE_IMG _make_test_img 64M
+TEST_IMG=$TOP_IMG _make_test_img -b ./image:base.$IMGFMT
+
+# The default cluster size depends on the image format
+TEST_IMG=$TOP_IMG _img_info | grep -v 'cluster_size'
+
+_rm_test_img "$BASE_IMG"
+_rm_test_img "$TOP_IMG"
+
+
+# Do another test where we access both top and base without any slash in them
+echo
+pushd "$TEST_DIR" >/dev/null
+
+BASE_IMG="base.$IMGFMT"
+TOP_IMG="file:image:top.$IMGFMT"
+
+TEST_IMG=$BASE_IMG _make_test_img 64M
+TEST_IMG=$TOP_IMG _make_test_img -b "$BASE_IMG"
+
+TEST_IMG=$TOP_IMG _img_info | grep -v 'cluster_size'
+
+_rm_test_img "$BASE_IMG"
+_rm_test_img "image:top.$IMGFMT"
+
+popd >/dev/null
+
+# Note that we could also do the same test with BASE_IMG=file:image:base.$IMGFMT
+# -- but behavior for that case is a bit strange. Protocol-prefixed paths are
+# in a sense always absolute paths, so such paths will never be combined with
+# the path of the overlay. But since "image:base.$IMGFMT" is actually a
+# relative path, it will always be evaluated relative to qemu's CWD (but not
+# relative to the overlay!). While this is more or less intended, it is still
+# pretty strange and thus not something that is tested here.
+# (The root of the issue is the use of a relative path with a protocol prefix.
+#  This may always give you weird results because in one sense, qemu considers
+#  such paths absolute, whereas in another, they are still relative.)
+
+
+# success, all done
+echo '*** done'
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/126.out b/tests/qemu-iotests/126.out
new file mode 100644
index 0000000..50d7308
--- /dev/null
+++ b/tests/qemu-iotests/126.out
@@ -0,0 +1,23 @@
+QA output created by 126
+
+=== Testing plain files ===
+
+Formatting 'TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864
+
+=== Testing relative backing filename resolution ===
+
+Formatting 'TEST_DIR/image:base.IMGFMT', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/image:top.IMGFMT', fmt=IMGFMT size=67108864 backing_file=./image:base.IMGFMT
+image: TEST_DIR/image:top.IMGFMT
+file format: IMGFMT
+virtual size: 64M (67108864 bytes)
+backing file: ./image:base.IMGFMT (actual path: TEST_DIR/./image:base.IMGFMT)
+
+Formatting 'base.IMGFMT', fmt=IMGFMT size=67108864
+Formatting 'file:image:top.IMGFMT', fmt=IMGFMT size=67108864 backing_file=base.IMGFMT
+image: ./image:top.IMGFMT
+file format: IMGFMT
+virtual size: 64M (67108864 bytes)
+backing file: base.IMGFMT (actual path: ./base.IMGFMT)
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 7d86715..40bef99 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -130,6 +130,7 @@
 122 rw auto
 123 rw auto quick
 124 rw auto backing
+126 rw auto backing
 128 rw auto quick
 129 rw auto quick
 130 rw auto quick
-- 
1.8.3.1

  parent reply	other threads:[~2017-07-07 17:11 UTC|newest]

Thread overview: 104+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-07 17:07 [Qemu-devel] [PULL 000/100] Block layer patches Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 001/100] qemu-io: Don't die on second open Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 002/100] block: Guarantee that *file is set on bdrv_get_block_status() Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 003/100] block: Simplify use of BDRV_BLOCK_RAW Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 004/100] blkdebug: Support .bdrv_co_get_block_status Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 005/100] vvfat: fix qemu-img map and qemu-img convert Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 006/100] vvfat: replace tabs by 8 spaces Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 007/100] vvfat: fix typos Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 008/100] vvfat: rename useless enumeration values Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 009/100] vvfat: introduce offset_to_bootsector, offset_to_fat and offset_to_root_dir Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 010/100] vvfat: fix field names in FAT12/FAT16 and FAT32 boot sectors Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 011/100] vvfat: always create . and .. entries at first and in that order Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 012/100] vvfat: correctly create long names for non-ASCII filenames Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 013/100] vvfat: correctly create base short " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 014/100] vvfat: correctly generate numeric-tail of short file names Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 015/100] vvfat: limit number of entries in root directory in FAT12/FAT16 Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 016/100] vvfat: handle KANJI lead byte 0xe5 Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 017/100] vvfat: change OEM name to 'MSWIN4.1' Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 018/100] qemu-img: drop -e and -6 options from the 'create' & 'convert' commands Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 019/100] blockdev: Print a warning for legacy drive options that belong to -device Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 020/100] blockjob: Track job ratelimits via bytes, not sectors Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 021/100] trace: Show blockjob actions " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 022/100] stream: Switch stream_populate() to byte-based Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 023/100] stream: Drop reached_end for stream_complete() Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 024/100] stream: Switch stream_run() to byte-based Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 025/100] commit: Switch commit_populate() " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 026/100] commit: Switch commit_run() " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 027/100] mirror: Switch MirrorBlockJob " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 028/100] mirror: Switch mirror_do_zero_or_discard() " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 029/100] mirror: Update signature of mirror_clip_sectors() Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 030/100] mirror: Switch mirror_cow_align() to byte-based Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 031/100] mirror: Switch mirror_do_read() " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 032/100] mirror: Switch mirror_iteration() " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 033/100] block: Drop unused bdrv_round_sectors_to_clusters() Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 034/100] backup: Switch BackupBlockJob to byte-based Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 035/100] backup: Switch block_backup.h " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 036/100] backup: Switch backup_do_cow() " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 037/100] backup: Switch backup_run() " Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 038/100] block: Make bdrv_is_allocated() byte-based Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 039/100] block: Minimize raw use of bds->total_sectors Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 040/100] block: Make bdrv_is_allocated_above() byte-based Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 041/100] block: expose crypto option names / defs to other drivers Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 042/100] block: add ability to set a prefix for opt names Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 043/100] qcow: document another weakness of qcow AES encryption Kevin Wolf
2017-07-07 17:07 ` [Qemu-devel] [PULL 044/100] qcow: require image size to be > 1 for new images Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 045/100] iotests: skip 042 with qcow which dosn't support zero sized images Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 046/100] iotests: skip 048 with qcow which doesn't support resize Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 047/100] block: deprecate "encryption=on" in favor of "encrypt.format=aes" Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 048/100] qcow: make encrypt_sectors encrypt in place Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 049/100] qcow: convert QCow to use QCryptoBlock for encryption Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 050/100] qcow2: make qcow2_encrypt_sectors encrypt in place Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 051/100] qcow2: convert QCow2 to use QCryptoBlock for encryption Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 052/100] qcow2: extend specification to cover LUKS encryption Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 053/100] qcow2: add support for LUKS encryption format Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 054/100] qcow2: add iotests to cover LUKS encryption support Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 055/100] iotests: enable tests 134 and 158 to work with qcow (v1) Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 056/100] block: rip out all traces of password prompting Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 057/100] block: remove all encryption handling APIs Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 058/100] block: pass option prefix down to crypto layer Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 059/100] qcow2: report encryption specific image information Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 060/100] docs: document encryption options for qcow, qcow2 and luks Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 061/100] iotests: 181 does not work for all formats Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 062/100] mirror: Fix inconsistent backing AioContext for after mirroring Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 063/100] specs/qcow2: fix bitmap granularity qemu-specific note Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 064/100] specs/qcow2: do not use wording 'bitmap header' Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 065/100] hbitmap: improve dirty iter Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 066/100] tests: add hbitmap iter test Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 067/100] block: fix bdrv_dirty_bitmap_granularity signature Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 068/100] block/dirty-bitmap: add deserialize_ones func Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 069/100] qcow2-refcount: rename inc_refcounts() and make it public Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 070/100] qcow2: add bitmaps extension Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 071/100] block/dirty-bitmap: fix comment for BlockDirtyBitmap.disabled field Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 072/100] block/dirty-bitmap: add readonly field to BdrvDirtyBitmap Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 073/100] qcow2: autoloading dirty bitmaps Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 074/100] block: refactor bdrv_reopen_commit Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 075/100] block: new bdrv_reopen_bitmaps_rw interface Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 076/100] qcow2: support .bdrv_reopen_bitmaps_rw Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 077/100] block/dirty-bitmap: add autoload field to BdrvDirtyBitmap Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 078/100] block: bdrv_close: release bitmaps after drv->bdrv_close Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 079/100] block: introduce persistent dirty bitmaps Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 080/100] block/dirty-bitmap: add bdrv_dirty_bitmap_next() Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 081/100] qcow2: add persistent dirty bitmaps support Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 082/100] qcow2: store bitmaps on reopening image as read-only Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 083/100] block: add bdrv_can_store_new_dirty_bitmap Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 084/100] qcow2: add .bdrv_can_store_new_dirty_bitmap Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 085/100] qmp: add persistent flag to block-dirty-bitmap-add Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 086/100] qmp: add autoload parameter " Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 087/100] qmp: add x-debug-block-dirty-bitmap-sha256 Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 088/100] iotests: test qcow2 persistent dirty bitmap Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 089/100] block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 090/100] qcow2: add .bdrv_remove_persistent_dirty_bitmap Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 091/100] qmp: block-dirty-bitmap-remove: remove persistent Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 092/100] block: release persistent bitmaps on inactivate Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 093/100] iotests: skip 159 & 170 with luks format Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 094/100] iotests: fix remainining tests to work with LUKS Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 095/100] iotests: reduce PBKDF iterations when testing LUKS Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 096/100] iotests: add more LUKS hash combination tests Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 097/100] iotests: chown LUKS device before qemu-io launches Kevin Wolf
2017-07-07 17:08 ` [Qemu-devel] [PULL 098/100] iotests: Use absolute paths for executables Kevin Wolf
2017-07-07 17:08 ` Kevin Wolf [this message]
2017-07-07 17:08 ` [Qemu-devel] [PULL 100/100] tests: Avoid non-portable 'echo -ARG' Kevin Wolf
2017-07-10  9:28 ` [Qemu-devel] [PULL 000/100] Block layer patches Peter Maydell
2017-07-10 11:16   ` Kevin Wolf
2017-07-11 14:35     ` [Qemu-devel] [Qemu-block] " Max Reitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1499447335-6125-100-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.