From 062ff8227a4636485cad246b35c8db6a3364bf9d Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 22 Oct 2019 10:29:19 -0400
Subject: [PATCH] tests: Update output with latest libvirt

Which forces disk type='file' when <source> is missing

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 tests/cli-test-xml/compare/virt-clone-clone-auto1.xml         | 2 +-
 .../cli-test-xml/compare/virt-xml-remove-disk-path-start.xml  | 2 +-
 .../compare/virt-xml-start-select-disk-bootorder.xml          | 2 +-
 .../compare/virt-xml-start-select-disk-bootorder2.xml         | 2 +-
 tests/testdriver.xml                                          | 4 ++--
 tests/testsuite.xml                                           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
index 5d21e7f5e..67360bcb6 100644
--- a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
+++ b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
@@ -31,7 +31,7 @@
       <readonly/>
       <address type="drive" controller="0" bus="0" target="0" unit="0"/>
     </disk>
-    <disk type="block" device="cdrom">
+    <disk type="file" device="cdrom">
       <target dev="sdb" bus="scsi"/>
       <readonly/>
       <address type="drive" controller="0" bus="0" target="0" unit="1"/>
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-disk-path-start.xml b/tests/cli-test-xml/compare/virt-xml-remove-disk-path-start.xml
index e04db8fba..06127f4b7 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-disk-path-start.xml
+++ b/tests/cli-test-xml/compare/virt-xml-remove-disk-path-start.xml
@@ -13,7 +13,7 @@
 -      <target dev="vdb" bus="virtio"/>
 -      <boot order="3"/>
 -    </disk>
-     <disk type="block" device="cdrom">
+     <disk type="file" device="cdrom">
        <target dev="hdc" bus="ide"/>
        <readonly/>
 
diff --git a/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder.xml b/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder.xml
index 280d9fc5f..bd29f059b 100644
--- a/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder.xml
+++ b/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder.xml
@@ -11,7 +11,7 @@
 -      <boot order="3"/>
 +      <boot order="4"/>
      </disk>
-     <disk type="block" device="cdrom">
+     <disk type="file" device="cdrom">
        <target dev="hdc" bus="ide"/>
        <readonly/>
 -      <boot order="1"/>
diff --git a/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder2.xml b/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder2.xml
index 1144f4c52..777044b2c 100644
--- a/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder2.xml
+++ b/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder2.xml
@@ -11,7 +11,7 @@
 -      <boot order="3"/>
 +      <boot order="4"/>
      </disk>
-     <disk type="block" device="cdrom">
+     <disk type="file" device="cdrom">
        <target dev="hdc" bus="ide"/>
        <readonly/>
 -      <boot order="1"/>
diff --git a/tests/testdriver.xml b/tests/testdriver.xml
index 9251983d6..e59ca7052 100644
--- a/tests/testdriver.xml
+++ b/tests/testdriver.xml
@@ -225,7 +225,7 @@ Foo bar baz &amp; yeah boii &lt; &gt; yeahfoo
     </disk>
 
     <!-- bus scsi -->
-    <disk type='block' device='cdrom'>
+    <disk type='file' device='cdrom'>
       <target dev='sdb' bus='scsi'/>
       <address type='drive' controller='5'/>
     </disk>
@@ -773,7 +773,7 @@ test-many-devices, like an alternate RNG, EOL OS ID, title field
       <target dev='sda' bus='scsi'/>
       <readonly/>
     </disk>
-    <disk type='block' device='cdrom'>
+    <disk type='file' device='cdrom'>
       <target dev='sdb' bus='scsi'/>
     </disk>
     <disk type='block' device='disk'>
diff --git a/tests/testsuite.xml b/tests/testsuite.xml
index f39cb4c0a..e8bba338c 100644
--- a/tests/testsuite.xml
+++ b/tests/testsuite.xml
@@ -388,7 +388,7 @@
       <target dev="vdb" bus="virtio"/>
       <boot order="3"/>
     </disk>
-    <disk type="block" device="cdrom">
+    <disk type="file" device="cdrom">
       <target dev="hdc" bus="ide"/>
       <readonly/>
       <boot order="1"/>