[virt-tools-list] [PATCH 3 of 5] tests: check spice/qxl configuration

[Marc-André Lureau]

# HG changeset patch
# User Marc-André Lureau <marcandre.lureau at redhat.com>
# Date 1289818670 -3600
# Node ID 299b77681910133c3c519a5aa4b196061317cce6
# Parent  2742bfaa7587afeee8423edcd53bea9ca7d66a8f
tests: check spice/qxl configuration

diff -r 2742bfaa7587 -r 299b77681910 tests/xmlconfig-xml/boot-many-devices.xml
--- a/tests/xmlconfig-xml/boot-many-devices.xml	Sat Nov 13 03:52:15 2010 +0100
+++ b/tests/xmlconfig-xml/boot-many-devices.xml	Mon Nov 15 11:57:50 2010 +0100
@@ -50,6 +50,7 @@
     <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
     <graphics type='vnc' port='-1' keymap='en-us'/>
     <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
     <serial type='null'/>
     <parallel type='unix'>
       <source mode='bind' path='/tmp/foobar'/>
@@ -65,6 +66,9 @@
     <video>
       <model type='cirrus'/>
     </video>
+    <video>
+      <model type='qxl'/>
+    </video>
     <hostdev mode='subsystem' type='usb' managed='yes'>
       <source>
         <vendor id='0x4321'/>
diff -r 2742bfaa7587 -r 299b77681910 tests/xmlconfig.py
--- a/tests/xmlconfig.py	Sat Nov 13 03:52:15 2010 +0100
+++ b/tests/xmlconfig.py	Mon Nov 15 11:57:50 2010 +0100
@@ -880,9 +880,13 @@
         vdev2.heads = 3
 
         vdev3 = VirtualVideoDevice(g.conn)
+        vdev4 = VirtualVideoDevice(g.conn)
+        vdev4.model_type = "qxl"
+
         g.add_device(vdev1)
         g.add_device(vdev2)
         g.add_device(vdev3)
+        g.add_device(vdev4)
 
         wdev2 = VirtualWatchdog(g.conn)
         wdev2.model = "ib700"
@@ -892,8 +896,10 @@
         gdev1 = virtinst.VirtualGraphics(conn=g.conn, type="vnc")
         gdev1.keymap = "en-us"
         gdev2 = virtinst.VirtualGraphics(conn=g.conn, type="sdl")
+        gdev3 = virtinst.VirtualGraphics(conn=g.conn, type="spice")
         g.add_device(gdev1)
         g.add_device(gdev2)
+        g.add_device(gdev3)
 
         g.clock.offset = "localtime"
 
diff -r 2742bfaa7587 -r 299b77681910 virtinst/VirtualGraphics.py
--- a/virtinst/VirtualGraphics.py	Sat Nov 13 03:52:15 2010 +0100
+++ b/virtinst/VirtualGraphics.py	Mon Nov 15 11:57:50 2010 +0100
@@ -203,9 +203,9 @@
         xml = "    <graphics type='spice' " + \
                    "port='%(port)d' " % { "port" : self._port } + \
                    "tlsPort='%(tlsPort)d' " % { "tlsPort" : self._tlsPort } + \
-                   "%(autoport)s " % { "autoport" : autoportxml } + \
-                   "%(keymapxml)s " % { "keymapxml" : keymapxml } + \
-                   "%(listenxml)s " % { "listenxml" : listenxml } + \
+                   "%(autoport)s" % { "autoport" : autoportxml } + \
+                   "%(keymapxml)s" % { "keymapxml" : keymapxml } + \
+                   "%(listenxml)s" % { "listenxml" : listenxml } + \
                    "%(passwdxml)s/>" % { "passwdxml" : passwdxml }
         return xml