tests: cli: Cover DeviceVideo bochs default

Signed-off-by: Cole Robinson <crobinso@redhat.com>

tests/data/capabilities/kvm-x86_64-domcaps.xml

@@ -113,6 +113,7 @@
         <value>vmvga</value>
         <value>qxl</value>
         <value>virtio</value>
+        <value>bochs</value>
       </enum>
     </video>
     <hostdev supported='yes'>

tests/data/cli/compare/virt-install-qemu-plain.xml

@@ -11,12 +11,12 @@
   <vcpu>2</vcpu>
   <os>
     <type arch="x86_64" machine="pc">hvm</type>
+    <loader readonly="yes" type="pflash">/usr/share/OVMF/OVMF_CODE.fd</loader>
     <boot dev="cdrom"/>
   </os>
   <features>
     <acpi/>
     <apic/>
-    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Penryn</model>
@@ -48,18 +48,10 @@
       <model type="virtio"/>
     </interface>
     <console type="pty"/>
-    <channel type="spicevmc">
-      <target type="virtio" name="com.redhat.spice.0"/>
-    </channel>
     <input type="tablet" bus="usb"/>
-    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
-      <image compression="off"/>
-    </graphics>
-    <sound model="ich6"/>
+    <graphics type="vnc" port="-1"/>
     <video>
-      <model type="qxl"/>
+      <model type="bochs"/>
     </video>
-    <redirdev bus="usb" type="spicevmc"/>
-    <redirdev bus="usb" type="spicevmc"/>
   </devices>
 </domain>

tests/data/cli/compare/virt-install-singleton-config-2.xml

@@ -198,7 +198,7 @@
     </tpm>
     <graphics type="vnc" port="-1"/>
     <video>
-      <model type="qxl"/>
+      <model type="bochs"/>
     </video>
     <watchdog model="ib700" action="pause"/>
     <memballoon model="virtio" autodeflate="on">
@@ -439,7 +439,7 @@
     </tpm>
     <graphics type="vnc" port="-1"/>
     <video>
-      <model type="qxl"/>
+      <model type="bochs"/>
     </video>
     <watchdog model="ib700" action="pause"/>
     <memballoon model="virtio" autodeflate="on">

tests/test_cli.py

@@ -936,7 +936,7 @@ c.add_compare("--os-variant fedora-unknown --file %(EXISTIMG1)s --location %(TRE
 c.add_compare("--test-media-detection %(TREEDIR)s --arch x86_64 --hvm", "test-url-detection")  # --test-media-detection
 c.add_compare("--os-variant http://fedoraproject.org/fedora/20 --disk %(EXISTIMG1)s,device=floppy --disk %(NEWIMG1)s,size=.01,format=vmdk --location %(TREEDIR)s --extra-args console=ttyS0 --quiet", "quiet-url", prerun_check=has_old_osinfo)  # Quiet URL install should make no noise
 c.add_compare("--cdrom %(EXISTIMG2)s --file %(EXISTIMG1)s --os-variant win2k3 --sound --controller usb", "kvm-win2k3-cdrom")  # HVM windows install with disk
-c.add_compare("--os-variant ubuntusaucy --nodisks --boot cdrom --virt-type qemu --cpu Penryn --input tablet", "qemu-plain")  # plain qemu
+c.add_compare("--os-variant ubuntusaucy --nodisks --boot cdrom --virt-type qemu --cpu Penryn --input tablet --boot uefi --graphics vnc", "qemu-plain")  # plain qemu
 c.add_compare("--os-variant fedora20 --nodisks --boot network --graphics default --arch i686 --rng none", "qemu-32-on-64", prerun_check=has_old_osinfo)  # 32 on 64
 
 # ppc64 tests