|
 |
ddf19c |
From a04d324e41a40a6893bc94109994afc017f17192 Mon Sep 17 00:00:00 2001
|
|
|
ddf19c |
From: Eric Blake <eblake@redhat.com>
|
|
|
ddf19c |
Date: Tue, 2 Jun 2020 02:34:16 +0100
|
|
|
ddf19c |
Subject: [PATCH 11/26] iotests: Fix test 178
|
|
|
ddf19c |
|
|
|
ddf19c |
RH-Author: Eric Blake <eblake@redhat.com>
|
|
|
ddf19c |
Message-id: <20200602023420.2133649-9-eblake@redhat.com>
|
|
|
ddf19c |
Patchwork-id: 97075
|
|
|
ddf19c |
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 08/12] iotests: Fix test 178
|
|
|
ddf19c |
Bugzilla: 1779893 1779904
|
|
|
ddf19c |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
ddf19c |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
ddf19c |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ddf19c |
|
|
|
ddf19c |
A recent change to qemu-img changed expected error message output, but
|
|
|
ddf19c |
178 takes long enough to execute that it does not get run by 'make
|
|
|
ddf19c |
check' or './check -g quick'.
|
|
|
ddf19c |
|
|
|
ddf19c |
Fixes: 43d589b074
|
|
|
ddf19c |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
ddf19c |
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
ddf19c |
Message-Id: <20200521192137.1120211-2-eblake@redhat.com>
|
|
|
ddf19c |
(cherry picked from commit ca01b7a641527052e3e8961845b40b81706ce5f9)
|
|
|
ddf19c |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
ddf19c |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
ddf19c |
---
|
|
|
ddf19c |
tests/qemu-iotests/178.out.qcow2 | 2 +-
|
|
|
ddf19c |
tests/qemu-iotests/178.out.raw | 2 +-
|
|
|
ddf19c |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
ddf19c |
|
|
|
ddf19c |
diff --git a/tests/qemu-iotests/178.out.qcow2 b/tests/qemu-iotests/178.out.qcow2
|
|
|
ddf19c |
index 9e7d8c4..345eab3 100644
|
|
|
ddf19c |
--- a/tests/qemu-iotests/178.out.qcow2
|
|
|
ddf19c |
+++ b/tests/qemu-iotests/178.out.qcow2
|
|
|
ddf19c |
@@ -13,7 +13,7 @@ qemu-img: Invalid option list: ,
|
|
|
ddf19c |
qemu-img: Invalid parameter 'snapshot.foo'
|
|
|
ddf19c |
qemu-img: Failed in parsing snapshot param 'snapshot.foo'
|
|
|
ddf19c |
qemu-img: --output must be used with human or json as argument.
|
|
|
ddf19c |
-qemu-img: Image size must be less than 8 EiB!
|
|
|
ddf19c |
+qemu-img: Invalid image size specified. Must be between 0 and 9223372036854775807.
|
|
|
ddf19c |
qemu-img: Unknown file format 'foo'
|
|
|
ddf19c |
|
|
|
ddf19c |
== Size calculation for a new file (human) ==
|
|
|
ddf19c |
diff --git a/tests/qemu-iotests/178.out.raw b/tests/qemu-iotests/178.out.raw
|
|
|
ddf19c |
index 6478365..15da915 100644
|
|
|
ddf19c |
--- a/tests/qemu-iotests/178.out.raw
|
|
|
ddf19c |
+++ b/tests/qemu-iotests/178.out.raw
|
|
|
ddf19c |
@@ -13,7 +13,7 @@ qemu-img: Invalid option list: ,
|
|
|
ddf19c |
qemu-img: Invalid parameter 'snapshot.foo'
|
|
|
ddf19c |
qemu-img: Failed in parsing snapshot param 'snapshot.foo'
|
|
|
ddf19c |
qemu-img: --output must be used with human or json as argument.
|
|
|
ddf19c |
-qemu-img: Image size must be less than 8 EiB!
|
|
|
ddf19c |
+qemu-img: Invalid image size specified. Must be between 0 and 9223372036854775807.
|
|
|
ddf19c |
qemu-img: Unknown file format 'foo'
|
|
|
ddf19c |
|
|
|
ddf19c |
== Size calculation for a new file (human) ==
|
|
|
ddf19c |
--
|
|
|
ddf19c |
1.8.3.1
|
|
|
ddf19c |
|