[virt-tools-list] [virt-manager PATCH] test: Fix tests with latest libvirt

Chen Hanxiao chen_han_xiao at 126.com
Sat May 28 07:12:54 UTC 2016


From: Chen Hanxiao <chenhanxiao at gmail.com>

libvirt commit
b33c14b342e5c2abeeee91c852ef2032327cb355
introduce this.

Signed-off-by: Chen Hanxiao <chenhanxiao at gmail.com>
---
 tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml  | 6 +++---
 tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml            | 2 +-
 tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml | 2 +-
 tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml    | 8 ++++----
 tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml     | 6 +++---
 tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml         | 2 +-
 tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml      | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml b/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml
index 14e350d..299ffcb 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml
@@ -1,13 +1,13 @@
          <device path="/dev/tzz"/>
        </backend>
      </tpm>
--    <graphics type="vnc" port="-1" autoport="yes"/>
+-    <graphics type="vnc" port="-1" autoport="yes">
+-      <listen type="address"/>
 +    <graphics type="spice" autoport="no">
 +      <gl enable="yes"/>
-+    </graphics>
+     </graphics>
      <sound model="sb16"/>
      <sound model="es1370"/>
-     <sound model="ich6"/>
 
 Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml b/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
index cde3838..7e4c250 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
@@ -1,4 +1,4 @@
-     <graphics type="vnc" port="-1" autoport="yes"/>
+     </graphics>
      <sound model="sb16"/>
      <sound model="es1370"/>
 -    <sound model="ich6"/>
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml b/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
index cde3838..7e4c250 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
@@ -1,4 +1,4 @@
-     <graphics type="vnc" port="-1" autoport="yes"/>
+     </graphics>
      <sound model="sb16"/>
      <sound model="es1370"/>
 -    <sound model="ich6"/>
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml
index a0ba254..655074e 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml
@@ -1,11 +1,11 @@
          <device path="/dev/tzz"/>
        </backend>
      </tpm>
--    <graphics type="vnc" port="-1" autoport="yes"/>
-+    <graphics type="vnc" port="-1" tlsPort="5902" keymap="ja"/>
+-    <graphics type="vnc" port="-1" autoport="yes">
++    <graphics type="vnc" port="-1" tlsPort="5902" keymap="ja">
+       <listen type="address"/>
+     </graphics>
      <sound model="sb16"/>
-     <sound model="es1370"/>
-     <sound model="ich6"/>
 
 Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml
index 642e5ba..c592205 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml
@@ -1,6 +1,6 @@
-       </backend>
-     </tpm>
-     <graphics type="vnc" port="-1" autoport="yes"/>
+     <graphics type="vnc" port="-1" autoport="yes">
+       <listen type="address"/>
+     </graphics>
 -    <sound model="sb16"/>
 +    <sound model="pcspk"/>
      <sound model="es1370"/>
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml
index 64388e6..6e534c9 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml
@@ -5,7 +5,7 @@
 +        <device path="/dev/tpm"/>
        </backend>
      </tpm>
-     <graphics type="vnc" port="-1" autoport="yes"/>
+     <graphics type="vnc" port="-1" autoport="yes">
 
 Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml b/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
index 5af1248..f15ca6e 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
+++ b/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
@@ -1,4 +1,4 @@
-     <graphics type="vnc" port="-1" autoport="yes"/>
+     </graphics>
      <sound model="sb16"/>
      <sound model="es1370"/>
 -    <sound model="ich6"/>
-- 
2.5.5





More information about the virt-tools-list mailing list