diff mbox

iotests: Update 049 output

Message ID 20170301152651.16390-1-famz@redhat.com
State New
Headers show

Commit Message

Fam Zheng March 1, 2017, 3:26 p.m. UTC 
75cdcd155 improved the error message, which affects the reference
output. Let's sync it up.

Note that previously '1kilobyte' was treated like '1k', but now it's an
error. Looking at the commit in question, this appears to be intended.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/049.out | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Comments

Eric Blake March 1, 2017, 3:40 p.m. UTC | #1 
On 03/01/2017 09:26 AM, Fam Zheng wrote:
> 75cdcd155 improved the error message, which affects the reference
> output. Let's sync it up.
> 
> Note that previously '1kilobyte' was treated like '1k', but now it's an
> error. Looking at the commit in question, this appears to be intended.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/049.out | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>
Kevin Wolf March 1, 2017, 3:45 p.m. UTC | #2 
Am 01.03.2017 um 16:26 hat Fam Zheng geschrieben:
> 75cdcd155 improved the error message, which affects the reference
> output. Let's sync it up.
> 
> Note that previously '1kilobyte' was treated like '1k', but now it's an
> error. Looking at the commit in question, this appears to be intended.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

Markus alread sent a fix: 'option: Tweak invalid size error message and
unbreak iotest 049'

Kevin
Fam Zheng March 1, 2017, 4:09 p.m. UTC | #3 
On Wed, 03/01 16:45, Kevin Wolf wrote:
> Am 01.03.2017 um 16:26 hat Fam Zheng geschrieben:
> > 75cdcd155 improved the error message, which affects the reference
> > output. Let's sync it up.
> > 
> > Note that previously '1kilobyte' was treated like '1k', but now it's an
> > error. Looking at the commit in question, this appears to be intended.
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> 
> Markus alread sent a fix: 'option: Tweak invalid size error message and
> unbreak iotest 049'

Aha, that's good then.

Fam
diff mbox

Patch

diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out
index 4673b67..17c2eb0 100644
--- a/tests/qemu-iotests/049.out
+++ b/tests/qemu-iotests/049.out
@@ -95,14 +95,14 @@  qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- -1024
 qemu-img: Image size must be less than 8 EiB!
 
 qemu-img create -f qcow2 -o size=-1024 TEST_DIR/t.qcow2
-qemu-img: Parameter 'size' expects a non-negative number below 2^64
+qemu-img: Value '-1024' is too large for parameter 'size'
 qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'
 
 qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- -1k
 qemu-img: Image size must be less than 8 EiB!
 
 qemu-img create -f qcow2 -o size=-1k TEST_DIR/t.qcow2
-qemu-img: Parameter 'size' expects a non-negative number below 2^64
+qemu-img: Value '-1k' is too large for parameter 'size'
 qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'
 
 qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- 1kilobyte
@@ -110,15 +110,19 @@  qemu-img: Invalid image size specified! You may use k, M, G, T, P or E suffixes
 qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes.
 
 qemu-img create -f qcow2 -o size=1kilobyte TEST_DIR/t.qcow2
-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16
+qemu-img: Parameter 'size' expects a non-negative number below 2^64
+Optional suffix k, M, G, T, P or E means kilo-, mega-, giga-, tera-, peta-
+and exabytes, respectively.
+qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'
 
 qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- foobar
 qemu-img: Invalid image size specified! You may use k, M, G, T, P or E suffixes for
 qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes.
 
 qemu-img create -f qcow2 -o size=foobar TEST_DIR/t.qcow2
-qemu-img: Parameter 'size' expects a size
-You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and terabytes.
+qemu-img: Parameter 'size' expects a non-negative number below 2^64
+Optional suffix k, M, G, T, P or E means kilo-, mega-, giga-, tera-, peta-
+and exabytes, respectively.
 qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'
 
 == Check correct interpretation of suffixes for cluster size ==