From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yv2RM-0002fB-MB for qemu-devel@nongnu.org; Wed, 20 May 2015 07:45:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yv2RI-0002a1-14 for qemu-devel@nongnu.org; Wed, 20 May 2015 07:45:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49105) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yv2RH-0002ZT-NM for qemu-devel@nongnu.org; Wed, 20 May 2015 07:45:31 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4KBjUgt022620 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 20 May 2015 07:45:31 -0400 From: "Daniel P. Berrange" Date: Wed, 20 May 2015 12:45:14 +0100 Message-Id: <1432122314-17287-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH] block: filter filename when testing encrypted images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf 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) @@ -20,7 +19,6 @@ read 134217728/134217728 bytes at offset 0 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: wrote 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -29,7 +27,6 @@ wrote 134217728/134217728 bytes at offset 0 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) @@ -38,7 +35,6 @@ read 134217728/134217728 bytes at offset 0 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: Pattern verification failed at offset 0, 134217728 bytes read 134217728/134217728 bytes at offset 0 diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 012a812..6ebef4c 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -151,7 +151,8 @@ _filter_qemu_io() { _filter_win32 | sed -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.inf]* [EPTGMKiBbytes]*\/sec and [0-9/.inf]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" \ -e "s/: line [0-9][0-9]*: *[0-9][0-9]*\( Aborted\| Killed\)/:\1/" \ - -e "s/qemu-io> //g" + -e "s/qemu-io> //g" \ + -e "/Disk image '.*' is encrypted\./d" } # replace occurrences of QEMU_PROG with "qemu" -- 2.1.0