Don't be too picky about the actual size and allocation. The size needs
to be correct but it's o.k. for allocation and size to be bigger. Debian
Wheezy's qemu adds 4096 bytes.
---
scripts/domain/121-block-info.t | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/domain/121-block-info.t b/scripts/domain/121-block-info.t
index dad00c6..4c3fafc 100644
--- a/scripts/domain/121-block-info.t
+++ b/scripts/domain/121-block-info.t
@@ -103,8 +103,8 @@ is($dom->get_block_info($dst2,0)->{physical}, 1024*1024,
"Get disk physical info
is($dom->get_block_info($dst,0)->{capacity}, 1024*1024*50, "Get disk capacity
info");
-is($dom->get_block_info($dst,0)->{allocation}, 1024*1024*50, "Get disk
allocation info");
-is($dom->get_block_info($dst,0)->{physical}, 1024*1024*50, "Get disk physical
info");
+ok($dom->get_block_info($dst,0)->{allocation} >= 1024*1024*50, "Get disk
allocation info");
+ok($dom->get_block_info($dst,0)->{physical} >= 1024*1024*50, "Get disk
physical info");
diag "Test block_resize";
lives_ok(sub {$dom->block_resize($dst, 512*50)}, "resize to 512*50 KB");
@@ -112,8 +112,8 @@ $st = stat($path);
is($st->size, 512*1024*50, "size is 25M");
is($dom->get_block_info($dst,0)->{capacity}, 1024*512*50, "Get disk capacity
info");
-is($dom->get_block_info($dst,0)->{allocation}, 1024*512*50, "Get disk
allocation info");
-is($dom->get_block_info($dst,0)->{physical}, 1024*512*50, "Get disk physical
info");
+ok($dom->get_block_info($dst,0)->{allocation} >= 1024*512*50, "Get disk
allocation info");
+ok($dom->get_block_info($dst,0)->{physical} >= 1024*512*50, "Get disk
physical info");
lives_ok(sub {$dom->block_resize($dst, 1024*50)}, "resize to 1024*50 KB");
$st = stat($path);
--
1.7.10.4
Show replies by date
On 05/27/2013 01:35 PM, Guido Günther wrote:
Don't be too picky about the actual size and allocation. The size
needs
to be correct but it's o.k. for allocation and size to be bigger. Debian
Wheezy's qemu adds 4096 bytes.
Yeah, different versions of qemu round to different granularity; rather
annoying but that's life.
---
scripts/domain/121-block-info.t | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
ACK.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org