From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yv5ZJ-0003Nv-88 for qemu-devel@nongnu.org; Wed, 20 May 2015 11:06:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yv5ZC-0004mB-ST for qemu-devel@nongnu.org; Wed, 20 May 2015 11:06:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yv5ZC-0004m4-KC for qemu-devel@nongnu.org; Wed, 20 May 2015 11:05:54 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4KF5rNG026600 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 20 May 2015 11:05:54 -0400 Date: Wed, 20 May 2015 17:05:51 +0200 From: Kevin Wolf Message-ID: <20150520150551.GI4917@noname.redhat.com> References: <1432122314-17287-1-git-send-email-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1432122314-17287-1-git-send-email-berrange@redhat.com> Subject: Re: [Qemu-devel] [PATCH] block: filter filename when testing encrypted images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" Cc: qemu-devel@nongnu.org Am 20.05.2015 um 13:45 hat Daniel P. Berrange geschrieben: > qemu-io prints a warning message > > "Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted." > > when opening an encrypted image, which was mistakenly included > in the expected output for test 131. Add a filter which strips > this filename from the output data. > > Signed-off-by: Daniel P. Berrange > --- > tests/qemu-iotests/131.out | 4 ---- > tests/qemu-iotests/common.filter | 3 ++- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out > index 4eedb35..7141e4f 100644 > --- a/tests/qemu-iotests/131.out > +++ b/tests/qemu-iotests/131.out > @@ -11,7 +11,6 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on > Encrypted images are deprecated > Support for them will be removed in a future release. > You can use 'qemu-img convert' to convert your image to an unencrypted one. > -Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted. > password: > read 134217728/134217728 bytes at offset 0 > 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Usually we just apply _filter_testdir(), which leaves the message around, but replaces the variable part with "TEST_DIR". I think that would be better here, too, because it shows that qemu-io did indeed recognise the image as encrypted. If you send a v2, I'll squash that into the original, buggy commit before sending a pull request. Kevin