[virt-tools-list] [virt-manager][PATCH] test: Adapt to new libvirt
Michal Privoznik
mprivozn at redhat.com
Fri Jan 29 10:16:29 UTC 2016
In libvirt commit 36785c7e775f3 the input devices are no longer
added by default in XML parsing phase rather than on domain
startup. However, we are not starting a domain just merely
playing around with its definition. Therefore we should adjust
expected outputs.
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
So the libvirt commit I'm referring to is not yet part of any release. Having
said that, is this the right way to fix the problem?
tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml | 4 ++--
tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml | 4 ++--
tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
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 6f75e29..a0ba254 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,6 +1,6 @@
+ <device path="/dev/tzz"/>
+ </backend>
</tpm>
- <input type="mouse" bus="ps2"/>
- <input type="keyboard" bus="ps2"/>
- <graphics type="vnc" port="-1" autoport="yes"/>
+ <graphics type="vnc" port="-1" tlsPort="5902" keymap="ja"/>
<sound model="sb16"/>
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 c48215d..642e5ba 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,5 +1,5 @@
- <input type="mouse" bus="ps2"/>
- <input type="keyboard" bus="ps2"/>
+ </backend>
+ </tpm>
<graphics type="vnc" port="-1" autoport="yes"/>
- <sound model="sb16"/>
+ <sound model="pcspk"/>
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 92266df..64388e6 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
@@ -1,11 +1,11 @@
- </channel>
+ <input type="mouse" bus="ps2"/>
<tpm model="tpm-tis">
<backend type="passthrough">
- <device path="/dev/tzz"/>
+ <device path="/dev/tpm"/>
</backend>
</tpm>
- <input type="mouse" bus="ps2"/>
+ <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
--
2.4.10
More information about the virt-tools-list
mailing list