[libvirt] [tck PATCH 3/3] scripts: fix block info test conditions

Daniel P. Berrangé berrange at redhat.com
Mon May 21 13:01:42 UTC 2018


The semantics of the "physical" field were fixed to not duplicate the
info of the "allocation" field.

The use of block_peek on non-raw volumes now raises an error since we
cannot peek inside volumes.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 scripts/domain/121-block-info.t | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/domain/121-block-info.t b/scripts/domain/121-block-info.t
index 6fa7780..bfff48c 100644
--- a/scripts/domain/121-block-info.t
+++ b/scripts/domain/121-block-info.t
@@ -99,7 +99,7 @@ $xml = $dom->get_xml_description();
 
 is($dom->get_block_info($dst2,0)->{capacity}, 1024*1024*50, "Get disk capacity info");
 is($dom->get_block_info($dst2,0)->{allocation}, 1024*1024, "Get disk allocation info");
-is($dom->get_block_info($dst2,0)->{physical}, 1024*1024, "Get disk physical info");
+is($dom->get_block_info($dst2,0)->{physical}, 1024*1024*50, "Get disk physical info");
 
 
 is($dom->get_block_info($dst,0)->{capacity}, 1024*1024*50, "Get disk capacity info");
@@ -124,8 +124,7 @@ my $date = "test";
 system("echo $date > $path");
 is($dom->block_peek($path,0,4,0), $date, "Get date from raw image");
 
-#qcow2 file start with hexadecimal:0x51 0x46 0x49 (ASCII: "QFI")
-is($dom->block_peek($path3,0,3,0), "QFI", "Get date from qcow2 image");
+dies_ok(sub { $dom->block_peek($path3,0,3,0) }, "Get date from qcow2 image");
 
 lives_ok(sub { $vol->delete(0) }, "deleted volume");
 
-- 
2.17.0




More information about the libvir-list mailing list