[libvirt-tck] scripts: fix disk media change test

Jim Fehlig posted 1 patch 2 weeks ago
Failed in applying to current master (apply log)
scripts/domain/207-disk-media-change.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

[libvirt-tck] scripts: fix disk media change test

Posted by Jim Fehlig 2 weeks ago
Since the introduction of the 'index' attribute of a disk's
<source> element, test 207-disk-media-change.t is failing. The
test is a bit flawed in that it compares initial and final domXML
after changing the media of a cdrom disk device. The test only
needs to check the final domXML to ensure the correct <source>
path exists at the end of the test.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---
 scripts/domain/207-disk-media-change.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/domain/207-disk-media-change.t b/scripts/domain/207-disk-media-change.t
index dfef7c9..7a43afc 100644
--- a/scripts/domain/207-disk-media-change.t
+++ b/scripts/domain/207-disk-media-change.t
@@ -98,5 +98,5 @@ EOF
 
     my $finalxml = $dom->get_xml_description;
 
-    is($initialxml, $finalxml, "final XML matches initial XML");
+    ok($finalxml =~ m|$path1|, "final XML has properly updated media");
 }
-- 
2.25.0


Re: [libvirt-tck] scripts: fix disk media change test

Posted by Daniel P. Berrangé 2 weeks ago
On Mon, Mar 23, 2020 at 05:09:24PM -0600, Jim Fehlig wrote:
> Since the introduction of the 'index' attribute of a disk's
> <source> element, test 207-disk-media-change.t is failing. The
> test is a bit flawed in that it compares initial and final domXML
> after changing the media of a cdrom disk device. The test only
> needs to check the final domXML to ensure the correct <source>
> path exists at the end of the test.
> 
> Signed-off-by: Jim Fehlig <jfehlig@suse.com>
> ---
>  scripts/domain/207-disk-media-change.t | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [libvirt-tck] scripts: fix disk media change test

Posted by Erik Skultety 2 weeks ago
On Mon, Mar 23, 2020 at 05:09:24PM -0600, Jim Fehlig wrote:
> Since the introduction of the 'index' attribute of a disk's
> <source> element, test 207-disk-media-change.t is failing. The
> test is a bit flawed in that it compares initial and final domXML
> after changing the media of a cdrom disk device. The test only
> needs to check the final domXML to ensure the correct <source>
> path exists at the end of the test.
>
> Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>