diff options
author | Cole Robinson <crobinso@redhat.com> | 2022-01-11 12:26:19 -0500 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2022-01-11 12:32:23 -0500 |
commit | c08e3e63972c6c66ee89290152860c5af445cc9c (patch) | |
tree | 572d291c81c5367a2891946aec5ae1dadd69e1f5 | |
parent | 7f5671700644d5a424ce0c2d528062064759df91 (diff) | |
download | virt-manager-c08e3e63972c6c66ee89290152860c5af445cc9c.tar.gz |
tests: make sure all test output ends with a newline
Simplifies viewing files in an editor, and some pytest output.
Signed-off-by: Cole Robinson <crobinso@redhat.com>
90 files changed, 94 insertions, 95 deletions
diff --git a/tests/data/cli/compare/virt-install-noargs-fail.xml b/tests/data/cli/compare/virt-install-noargs-fail.xml index 67af1506..424d00b8 100644 --- a/tests/data/cli/compare/virt-install-noargs-fail.xml +++ b/tests/data/cli/compare/virt-install-noargs-fail.xml @@ -3,4 +3,4 @@ ERROR --memory amount in MiB is required --disk storage must be specified (override with --disk none) An install method must be specified -(--location URL, --cdrom CD/ISO, --pxe, --import, --boot hd|cdrom|...)
\ No newline at end of file +(--location URL, --cdrom CD/ISO, --pxe, --import, --boot hd|cdrom|...) diff --git a/tests/data/cli/compare/virt-install-osvariant-noargs-fail.xml b/tests/data/cli/compare/virt-install-osvariant-noargs-fail.xml index 961ae4c6..5c7f904d 100644 --- a/tests/data/cli/compare/virt-install-osvariant-noargs-fail.xml +++ b/tests/data/cli/compare/virt-install-osvariant-noargs-fail.xml @@ -3,4 +3,4 @@ Using fedora26 default --memory 2048 Using fedora26 default --disk size=20 ERROR An install method must be specified -(--location URL, --cdrom CD/ISO, --pxe, --import, --boot hd|cdrom|...)
\ No newline at end of file +(--location URL, --cdrom CD/ISO, --pxe, --import, --boot hd|cdrom|...) diff --git a/tests/data/cli/compare/virt-install-quiet-url.xml b/tests/data/cli/compare/virt-install-quiet-url.xml index e69de29b..8b137891 100644 --- a/tests/data/cli/compare/virt-install-quiet-url.xml +++ b/tests/data/cli/compare/virt-install-quiet-url.xml @@ -0,0 +1 @@ + diff --git a/tests/data/cli/compare/virt-install-test-url-detection.xml b/tests/data/cli/compare/virt-install-test-url-detection.xml index e7fec4d2..222d4153 100644 --- a/tests/data/cli/compare/virt-install-test-url-detection.xml +++ b/tests/data/cli/compare/virt-install-test-url-detection.xml @@ -1 +1 @@ -fedora17
\ No newline at end of file +fedora17 diff --git a/tests/data/cli/compare/virt-xml-add-disk-basic-start.xml b/tests/data/cli/compare/virt-xml-add-disk-basic-start.xml index 0071d9e7..284af634 100644 --- a/tests/data/cli/compare/virt-xml-add-disk-basic-start.xml +++ b/tests/data/cli/compare/virt-xml-add-disk-basic-start.xml @@ -8,4 +8,4 @@ </devices> </domain> -Domain 'test-state-shutoff' started successfully.
\ No newline at end of file +Domain 'test-state-shutoff' started successfully. diff --git a/tests/data/cli/compare/virt-xml-add-disk-basic.xml b/tests/data/cli/compare/virt-xml-add-disk-basic.xml index 8035c31f..db242c29 100644 --- a/tests/data/cli/compare/virt-xml-add-disk-basic.xml +++ b/tests/data/cli/compare/virt-xml-add-disk-basic.xml @@ -10,4 +10,4 @@ <keywrap> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-add-disk-create-storage-start.xml b/tests/data/cli/compare/virt-xml-add-disk-create-storage-start.xml index 6a02dcc3..e3e7bcac 100644 --- a/tests/data/cli/compare/virt-xml-add-disk-create-storage-start.xml +++ b/tests/data/cli/compare/virt-xml-add-disk-create-storage-start.xml @@ -8,4 +8,4 @@ </devices> </domain> -Domain 'test-state-shutoff' started successfully.
\ No newline at end of file +Domain 'test-state-shutoff' started successfully. diff --git a/tests/data/cli/compare/virt-xml-add-disk-create-storage.xml b/tests/data/cli/compare/virt-xml-add-disk-create-storage.xml index 7fd92ac4..5892a5cd 100644 --- a/tests/data/cli/compare/virt-xml-add-disk-create-storage.xml +++ b/tests/data/cli/compare/virt-xml-add-disk-create-storage.xml @@ -10,4 +10,4 @@ <keywrap> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-add-disk-default-storage.xml b/tests/data/cli/compare/virt-xml-add-disk-default-storage.xml index 825468ff..ccd345d1 100644 --- a/tests/data/cli/compare/virt-xml-add-disk-default-storage.xml +++ b/tests/data/cli/compare/virt-xml-add-disk-default-storage.xml @@ -10,4 +10,4 @@ <keywrap> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-add-disk-notarget.xml b/tests/data/cli/compare/virt-xml-add-disk-notarget.xml index eb55c3b7..b03a24d3 100644 --- a/tests/data/cli/compare/virt-xml-add-disk-notarget.xml +++ b/tests/data/cli/compare/virt-xml-add-disk-notarget.xml @@ -10,4 +10,4 @@ <keywrap> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-add-host-device-start.xml b/tests/data/cli/compare/virt-xml-add-host-device-start.xml index b3db5279..5bfc8cf5 100644 --- a/tests/data/cli/compare/virt-xml-add-host-device-start.xml +++ b/tests/data/cli/compare/virt-xml-add-host-device-start.xml @@ -11,4 +11,4 @@ </domain> Domain 'test-state-shutoff' defined successfully. -Domain 'test-state-shutoff' started successfully.
\ No newline at end of file +Domain 'test-state-shutoff' started successfully. diff --git a/tests/data/cli/compare/virt-xml-add-hostdev-mdev-start.xml b/tests/data/cli/compare/virt-xml-add-hostdev-mdev-start.xml index 61be5d22..3742d454 100644 --- a/tests/data/cli/compare/virt-xml-add-hostdev-mdev-start.xml +++ b/tests/data/cli/compare/virt-xml-add-hostdev-mdev-start.xml @@ -9,4 +9,4 @@ </devices> </domain> -Domain 'test-state-shutoff' started successfully.
\ No newline at end of file +Domain 'test-state-shutoff' started successfully. diff --git a/tests/data/cli/compare/virt-xml-add-hostdev-mdev.xml b/tests/data/cli/compare/virt-xml-add-hostdev-mdev.xml index 5ef8df6f..c2acff8f 100644 --- a/tests/data/cli/compare/virt-xml-add-hostdev-mdev.xml +++ b/tests/data/cli/compare/virt-xml-add-hostdev-mdev.xml @@ -11,4 +11,4 @@ <keywrap> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-add-sound.xml b/tests/data/cli/compare/virt-xml-add-sound.xml index 2d8911c6..3040c8c0 100644 --- a/tests/data/cli/compare/virt-xml-add-sound.xml +++ b/tests/data/cli/compare/virt-xml-add-sound.xml @@ -7,4 +7,4 @@ <keywrap> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-all.xml b/tests/data/cli/compare/virt-xml-edit-all.xml index 5bdee2aa..76a29391 100644 --- a/tests/data/cli/compare/virt-xml-edit-all.xml +++ b/tests/data/cli/compare/virt-xml-edit-all.xml @@ -21,4 +21,4 @@ <source mode="connect" host="localhost" service="4000"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-bootorder.xml b/tests/data/cli/compare/virt-xml-edit-bootorder.xml index 0be579b4..184004ee 100644 --- a/tests/data/cli/compare/virt-xml-edit-bootorder.xml +++ b/tests/data/cli/compare/virt-xml-edit-bootorder.xml @@ -1,2 +1,2 @@ Domain 'test' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-clear-clock.xml b/tests/data/cli/compare/virt-xml-edit-clear-clock.xml index c08613bb..f1c4b8f7 100644 --- a/tests/data/cli/compare/virt-xml-edit-clear-clock.xml +++ b/tests/data/cli/compare/virt-xml-edit-clear-clock.xml @@ -12,4 +12,4 @@ <on_crash>destroy</on_crash> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-clear-cpu.xml b/tests/data/cli/compare/virt-xml-edit-clear-cpu.xml index 0afdc45c..8d02b931 100644 --- a/tests/data/cli/compare/virt-xml-edit-clear-cpu.xml +++ b/tests/data/cli/compare/virt-xml-edit-clear-cpu.xml @@ -30,4 +30,4 @@ <timer name="pit" tickpolicy="delay"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-clear-disk.xml b/tests/data/cli/compare/virt-xml-edit-clear-disk.xml index d0d6c8b3..c75cf51a 100644 --- a/tests/data/cli/compare/virt-xml-edit-clear-disk.xml +++ b/tests/data/cli/compare/virt-xml-edit-clear-disk.xml @@ -13,4 +13,4 @@ <source file="/tmp/foobar"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-clearxml-qemu-commandline.xml b/tests/data/cli/compare/virt-xml-edit-clearxml-qemu-commandline.xml index 354fe4af..4e69abdc 100644 --- a/tests/data/cli/compare/virt-xml-edit-clearxml-qemu-commandline.xml +++ b/tests/data/cli/compare/virt-xml-edit-clearxml-qemu-commandline.xml @@ -6,4 +6,4 @@ - <qemu:arg value="-somearg"/> - <qemu:arg value="bar,baz=wib wob"/> - </qemu:commandline> - </domain>
\ No newline at end of file + </domain> diff --git a/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml b/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml index 7b0873e1..8f59291f 100644 --- a/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml +++ b/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml @@ -1,2 +1,2 @@ Domain 'test-many-devices' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-disable-memballoon.xml b/tests/data/cli/compare/virt-xml-edit-disable-memballoon.xml index e40396c2..da52db80 100644 --- a/tests/data/cli/compare/virt-xml-edit-disable-memballoon.xml +++ b/tests/data/cli/compare/virt-xml-edit-disable-memballoon.xml @@ -8,4 +8,4 @@ <backend model="egd" type="tcp"> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-disk-unset.xml b/tests/data/cli/compare/virt-xml-edit-disk-unset.xml index 32d1d9c9..f83f168b 100644 --- a/tests/data/cli/compare/virt-xml-edit-disk-unset.xml +++ b/tests/data/cli/compare/virt-xml-edit-disk-unset.xml @@ -11,4 +11,4 @@ <disk type="file" device="disk"> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-graphics-listen-none.xml b/tests/data/cli/compare/virt-xml-edit-graphics-listen-none.xml index 275f4759..3bf0b7e5 100644 --- a/tests/data/cli/compare/virt-xml-edit-graphics-listen-none.xml +++ b/tests/data/cli/compare/virt-xml-edit-graphics-listen-none.xml @@ -10,4 +10,4 @@ <sound model="es1370"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-graphics-spice-gl.xml b/tests/data/cli/compare/virt-xml-edit-graphics-spice-gl.xml index 4656e313..f87c9d55 100644 --- a/tests/data/cli/compare/virt-xml-edit-graphics-spice-gl.xml +++ b/tests/data/cli/compare/virt-xml-edit-graphics-spice-gl.xml @@ -11,4 +11,4 @@ <sound model="es1370"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-hostdev-mdev.xml b/tests/data/cli/compare/virt-xml-edit-hostdev-mdev.xml index c59e7caa..ef5523db 100644 --- a/tests/data/cli/compare/virt-xml-edit-hostdev-mdev.xml +++ b/tests/data/cli/compare/virt-xml-edit-hostdev-mdev.xml @@ -8,4 +8,4 @@ <source mode="connect" host="localhost" service="4000"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-metadata-full-os.xml b/tests/data/cli/compare/virt-xml-edit-metadata-full-os.xml index 5fbd3e07..1120eb78 100644 --- a/tests/data/cli/compare/virt-xml-edit-metadata-full-os.xml +++ b/tests/data/cli/compare/virt-xml-edit-metadata-full-os.xml @@ -8,4 +8,4 @@ <memory unit="KiB">4194304</memory> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-neg-num.xml b/tests/data/cli/compare/virt-xml-edit-neg-num.xml index c38e3e76..1264749f 100644 --- a/tests/data/cli/compare/virt-xml-edit-neg-num.xml +++ b/tests/data/cli/compare/virt-xml-edit-neg-num.xml @@ -8,4 +8,4 @@ <source> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-pos-num.xml b/tests/data/cli/compare/virt-xml-edit-pos-num.xml index 797ee720..4824d367 100644 --- a/tests/data/cli/compare/virt-xml-edit-pos-num.xml +++ b/tests/data/cli/compare/virt-xml-edit-pos-num.xml @@ -8,4 +8,4 @@ </video> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder.xml index 60114b99..def24334 100644 --- a/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder.xml +++ b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder.xml @@ -16,4 +16,4 @@ <controller type="scsi" index="0"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder2.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder2.xml index 0c35cd14..e4917eaf 100644 --- a/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder2.xml +++ b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder2.xml @@ -15,4 +15,4 @@ <interface type="user"> Domain 'test-collide' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-select-disk-path.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-path.xml index 51bf9366..857e7b52 100644 --- a/tests/data/cli/compare/virt-xml-edit-select-disk-path.xml +++ b/tests/data/cli/compare/virt-xml-edit-select-disk-path.xml @@ -10,4 +10,4 @@ <controller type="scsi" index="1"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-select-disk-target.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-target.xml index 680bf90e..19e1be83 100644 --- a/tests/data/cli/compare/virt-xml-edit-select-disk-target.xml +++ b/tests/data/cli/compare/virt-xml-edit-select-disk-target.xml @@ -8,4 +8,4 @@ <read_bytes_sec>5242880</read_bytes_sec> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-select-network-mac.xml b/tests/data/cli/compare/virt-xml-edit-select-network-mac.xml index 80443076..a3146a47 100644 --- a/tests/data/cli/compare/virt-xml-edit-select-network-mac.xml +++ b/tests/data/cli/compare/virt-xml-edit-select-network-mac.xml @@ -8,4 +8,4 @@ <address type="ccid" controller="0" slot="0"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-select-sound-model.xml b/tests/data/cli/compare/virt-xml-edit-select-sound-model.xml index 797ee720..4824d367 100644 --- a/tests/data/cli/compare/virt-xml-edit-select-sound-model.xml +++ b/tests/data/cli/compare/virt-xml-edit-select-sound-model.xml @@ -8,4 +8,4 @@ </video> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-blkiotune.xml b/tests/data/cli/compare/virt-xml-edit-simple-blkiotune.xml index 88faf6d6..024b7805 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-blkiotune.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-blkiotune.xml @@ -13,4 +13,4 @@ <memoryBacking> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-boot.xml b/tests/data/cli/compare/virt-xml-edit-simple-boot.xml index 80c05a7c..334cad71 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-boot.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-boot.xml @@ -11,4 +11,4 @@ <uid start="0" target="1000" count="10"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-channel.xml b/tests/data/cli/compare/virt-xml-edit-simple-channel.xml index f0e55914..310fb19e 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-channel.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-channel.xml @@ -8,4 +8,4 @@ </channel> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-clock.xml b/tests/data/cli/compare/virt-xml-edit-simple-clock.xml index d660e7f6..3f5df69a 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-clock.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-clock.xml @@ -14,4 +14,4 @@ <on_reboot>restart</on_reboot> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-console.xml b/tests/data/cli/compare/virt-xml-edit-simple-console.xml index c6f04c13..884bb5b7 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-console.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-console.xml @@ -8,4 +8,4 @@ <target type="virtio" port="1"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-controller.xml b/tests/data/cli/compare/virt-xml-edit-simple-controller.xml index 12794d13..87393cd1 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-controller.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-controller.xml @@ -8,4 +8,4 @@ <controller type="scsi" index="3"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-cpu.xml b/tests/data/cli/compare/virt-xml-edit-simple-cpu.xml index ce67f937..55907aca 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-cpu.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-cpu.xml @@ -19,4 +19,4 @@ <timer name="rtc" tickpolicy="catchup"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-disk-remove-path.xml b/tests/data/cli/compare/virt-xml-edit-simple-disk-remove-path.xml index b157b1d5..a372a527 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-disk-remove-path.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-disk-remove-path.xml @@ -7,4 +7,4 @@ <address type="drive" controller="0" bus="0" target="0" unit="0"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-disk.xml b/tests/data/cli/compare/virt-xml-edit-simple-disk.xml index 782b326d..be5f5a90 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-disk.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-disk.xml @@ -12,4 +12,4 @@ <source file="/tmp/foobar"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-events.xml b/tests/data/cli/compare/virt-xml-edit-simple-events.xml index be2a4b66..add7d6a3 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-events.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-events.xml @@ -8,4 +8,4 @@ </pm> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-features.xml b/tests/data/cli/compare/virt-xml-edit-simple-features.xml index eebe96df..bc594fe1 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-features.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-features.xml @@ -12,4 +12,4 @@ </hyperv> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-filesystem.xml b/tests/data/cli/compare/virt-xml-edit-simple-filesystem.xml index f7ccc6de..6633ad66 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-filesystem.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-filesystem.xml @@ -13,4 +13,4 @@ <mac address="22:22:33:54:32:10"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-graphics.xml b/tests/data/cli/compare/virt-xml-edit-simple-graphics.xml index 22176d87..51e0fd5b 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-graphics.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-graphics.xml @@ -8,4 +8,4 @@ <sound model="sb16"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-host-device.xml b/tests/data/cli/compare/virt-xml-edit-simple-host-device.xml index 9359457d..dcba65c8 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-host-device.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-host-device.xml @@ -7,4 +7,4 @@ <source> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-idmap.xml b/tests/data/cli/compare/virt-xml-edit-simple-idmap.xml index 42916bb8..78a512f2 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-idmap.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-idmap.xml @@ -10,4 +10,4 @@ <acpi/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-memballoon.xml b/tests/data/cli/compare/virt-xml-edit-simple-memballoon.xml index e40396c2..da52db80 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-memballoon.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-memballoon.xml @@ -8,4 +8,4 @@ <backend model="egd" type="tcp"> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-memory.xml b/tests/data/cli/compare/virt-xml-edit-simple-memory.xml index 89902c4c..d452cb58 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-memory.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-memory.xml @@ -21,4 +21,4 @@ <iothreadids> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-metadata.xml b/tests/data/cli/compare/virt-xml-edit-simple-metadata.xml index b40afcf2..593e7357 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-metadata.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-metadata.xml @@ -23,4 +23,4 @@ </domain> Domain 'foo-my-new-name' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-network.xml b/tests/data/cli/compare/virt-xml-edit-simple-network.xml index c24b5a04..2d031e26 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-network.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-network.xml @@ -14,4 +14,4 @@ <mac address="22:00:00:44:aa:bf"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-numatune.xml b/tests/data/cli/compare/virt-xml-edit-simple-numatune.xml index 9d63ca42..499b4e7c 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-numatune.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-numatune.xml @@ -8,4 +8,4 @@ <type arch="i686">hvm</type> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-parallel.xml b/tests/data/cli/compare/virt-xml-edit-simple-parallel.xml index 2648cc07..9f8b9769 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-parallel.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-parallel.xml @@ -10,4 +10,4 @@ <console type="null"> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-pm.xml b/tests/data/cli/compare/virt-xml-edit-simple-pm.xml index 3df18a31..cdfdaa89 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-pm.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-pm.xml @@ -9,4 +9,4 @@ <emulator>/usr/lib/xen/bin/qemu-dm</emulator> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-qemu-commandline.xml b/tests/data/cli/compare/virt-xml-edit-simple-qemu-commandline.xml index ff00f1a2..29faa195 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-qemu-commandline.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-qemu-commandline.xml @@ -8,4 +8,4 @@ </domain> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-redirdev.xml b/tests/data/cli/compare/virt-xml-edit-simple-redirdev.xml index f1a0ff6c..15a4b0d9 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-redirdev.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-redirdev.xml @@ -10,4 +10,4 @@ <redirfilter> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-rng.xml b/tests/data/cli/compare/virt-xml-edit-simple-rng.xml index 8d24e544..bf575c4e 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-rng.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-rng.xml @@ -16,4 +16,4 @@ </rng> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-security.xml b/tests/data/cli/compare/virt-xml-edit-simple-security.xml index d300f38b..ff78bacb 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-security.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-security.xml @@ -10,4 +10,4 @@ </keywrap> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-serial.xml b/tests/data/cli/compare/virt-xml-edit-simple-serial.xml index cbf49e02..cde98969 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-serial.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-serial.xml @@ -8,4 +8,4 @@ <parallel type="file"> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-smartcard.xml b/tests/data/cli/compare/virt-xml-edit-simple-smartcard.xml index 9eaf2377..80ef8269 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-smartcard.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-smartcard.xml @@ -8,4 +8,4 @@ <serial type="null"> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-soundhw.xml b/tests/data/cli/compare/virt-xml-edit-simple-soundhw.xml index 411e7918..da5554a3 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-soundhw.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-soundhw.xml @@ -8,4 +8,4 @@ <video> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-tpm.xml b/tests/data/cli/compare/virt-xml-edit-simple-tpm.xml index 7cac1f45..2dfb3313 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-tpm.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-tpm.xml @@ -10,4 +10,4 @@ <listen type="address"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-vcpus.xml b/tests/data/cli/compare/virt-xml-edit-simple-vcpus.xml index e4d88442..318a5936 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-vcpus.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-vcpus.xml @@ -16,4 +16,4 @@ <timer name="rtc" tickpolicy="catchup"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-video.xml b/tests/data/cli/compare/virt-xml-edit-simple-video.xml index 6b7befca..eb8a3270 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-video.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-video.xml @@ -8,4 +8,4 @@ <model type="cirrus" vram="16384" heads="3"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-vsock.xml b/tests/data/cli/compare/virt-xml-edit-simple-vsock.xml index 4fea668c..88814afe 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-vsock.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-vsock.xml @@ -8,4 +8,4 @@ <seclabel type="dynamic" model="selinux" relabel="yes"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-simple-watchdog.xml b/tests/data/cli/compare/virt-xml-edit-simple-watchdog.xml index 314cbf3a..c36327c4 100644 --- a/tests/data/cli/compare/virt-xml-edit-simple-watchdog.xml +++ b/tests/data/cli/compare/virt-xml-edit-simple-watchdog.xml @@ -8,4 +8,4 @@ <rate bytes="1234" period="2000"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-video-virtio.xml b/tests/data/cli/compare/virt-xml-edit-video-virtio.xml index 336df865..701045d2 100644 --- a/tests/data/cli/compare/virt-xml-edit-video-virtio.xml +++ b/tests/data/cli/compare/virt-xml-edit-video-virtio.xml @@ -10,4 +10,4 @@ <model type="cirrus" vram="16384" heads="3"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-edit-xpaths.xml b/tests/data/cli/compare/virt-xml-edit-xpaths.xml index e424f6cd..6bdb824a 100644 --- a/tests/data/cli/compare/virt-xml-edit-xpaths.xml +++ b/tests/data/cli/compare/virt-xml-edit-xpaths.xml @@ -23,4 +23,4 @@ </domain> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-hyperv-uefi-collision.xml b/tests/data/cli/compare/virt-xml-hyperv-uefi-collision.xml index 12607a14..774b258b 100644 --- a/tests/data/cli/compare/virt-xml-hyperv-uefi-collision.xml +++ b/tests/data/cli/compare/virt-xml-hyperv-uefi-collision.xml @@ -1,2 +1,2 @@ Domain 'test-hyperv-uefi' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml index 515919b0..c5502828 100644 --- a/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml +++ b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml @@ -15,4 +15,4 @@ </domain> Domain 'test' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-xml.xml b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-xml.xml index 4ee0f1cb..49e5afd3 100644 --- a/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-xml.xml +++ b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-xml.xml @@ -10,4 +10,4 @@ </domain> Domain 'test' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-cmdline.xml b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-cmdline.xml index 82644b32..4f272fc3 100644 --- a/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-cmdline.xml +++ b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-cmdline.xml @@ -15,4 +15,4 @@ </domain> Domain 'test' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-xml.xml b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-xml.xml index b5e1146f..3551cb95 100644 --- a/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-xml.xml +++ b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-xml.xml @@ -10,4 +10,4 @@ </domain> Domain 'test' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-prompt-response.xml b/tests/data/cli/compare/virt-xml-prompt-response.xml index 3eb4808e..531cabe0 100644 --- a/tests/data/cli/compare/virt-xml-prompt-response.xml +++ b/tests/data/cli/compare/virt-xml-prompt-response.xml @@ -8,4 +8,4 @@ </domain> Define 'test' with the changed XML? (y/n): Domain 'test' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-remove-console-dup.xml b/tests/data/cli/compare/virt-xml-remove-console-dup.xml index 909b3f34..dd06ab68 100644 --- a/tests/data/cli/compare/virt-xml-remove-console-dup.xml +++ b/tests/data/cli/compare/virt-xml-remove-console-dup.xml @@ -12,4 +12,4 @@ - </console> - </devices> + <devices/> - </domain>
\ No newline at end of file + </domain> diff --git a/tests/data/cli/compare/virt-xml-remove-disk-index.xml b/tests/data/cli/compare/virt-xml-remove-disk-index.xml index f0994381..8d0b22d6 100644 --- a/tests/data/cli/compare/virt-xml-remove-disk-index.xml +++ b/tests/data/cli/compare/virt-xml-remove-disk-index.xml @@ -16,4 +16,4 @@ <controller type="scsi" index="1"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-remove-disk-path-start.xml b/tests/data/cli/compare/virt-xml-remove-disk-path-start.xml index 06127f4b..d971f723 100644 --- a/tests/data/cli/compare/virt-xml-remove-disk-path-start.xml +++ b/tests/data/cli/compare/virt-xml-remove-disk-path-start.xml @@ -17,4 +17,4 @@ <target dev="hdc" bus="ide"/> <readonly/> -Domain 'test-state-shutoff' started successfully.
\ No newline at end of file +Domain 'test-state-shutoff' started successfully. diff --git a/tests/data/cli/compare/virt-xml-remove-disk-path.xml b/tests/data/cli/compare/virt-xml-remove-disk-path.xml index a3313cb7..4e52af99 100644 --- a/tests/data/cli/compare/virt-xml-remove-disk-path.xml +++ b/tests/data/cli/compare/virt-xml-remove-disk-path.xml @@ -12,4 +12,4 @@ <target dev="hda" bus="ide"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-remove-hostdev-mdev.xml b/tests/data/cli/compare/virt-xml-remove-hostdev-mdev.xml index 75d01179..d4c33804 100644 --- a/tests/data/cli/compare/virt-xml-remove-hostdev-mdev.xml +++ b/tests/data/cli/compare/virt-xml-remove-hostdev-mdev.xml @@ -12,4 +12,4 @@ <protocol type="raw"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-remove-hostdev-name.xml b/tests/data/cli/compare/virt-xml-remove-hostdev-name.xml index f0c19062..45ff1f7d 100644 --- a/tests/data/cli/compare/virt-xml-remove-hostdev-name.xml +++ b/tests/data/cli/compare/virt-xml-remove-hostdev-name.xml @@ -12,4 +12,4 @@ <address domain="0x0000" bus="0x00" slot="0x19" function="0x0"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-remove-memballoon.xml b/tests/data/cli/compare/virt-xml-remove-memballoon.xml index 42ed467b..1caff9f6 100644 --- a/tests/data/cli/compare/virt-xml-remove-memballoon.xml +++ b/tests/data/cli/compare/virt-xml-remove-memballoon.xml @@ -7,4 +7,4 @@ <backend model="egd" type="tcp"> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-remove-sound-model.xml b/tests/data/cli/compare/virt-xml-remove-sound-model.xml index d80497eb..cf82bb78 100644 --- a/tests/data/cli/compare/virt-xml-remove-sound-model.xml +++ b/tests/data/cli/compare/virt-xml-remove-sound-model.xml @@ -7,4 +7,4 @@ </video> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-remove-video-all.xml b/tests/data/cli/compare/virt-xml-remove-video-all.xml index 781531ee..1a6002c3 100644 --- a/tests/data/cli/compare/virt-xml-remove-video-all.xml +++ b/tests/data/cli/compare/virt-xml-remove-video-all.xml @@ -12,4 +12,4 @@ <vendor id="0x04b3"/> Domain 'test-for-virtxml' defined successfully. -Changes will take effect after the domain is fully powered off.
\ No newline at end of file +Changes will take effect after the domain is fully powered off. diff --git a/tests/data/cli/compare/virt-xml-start-select-disk-bootorder.xml b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder.xml index bd29f059..64b4cd2d 100644 --- a/tests/data/cli/compare/virt-xml-start-select-disk-bootorder.xml +++ b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder.xml @@ -30,4 +30,4 @@ <mac address="52:54:00:11:fa:28"/> Domain 'test-state-shutoff' defined successfully. -Domain 'test-state-shutoff' started successfully.
\ No newline at end of file +Domain 'test-state-shutoff' started successfully. diff --git a/tests/data/cli/compare/virt-xml-start-select-disk-bootorder2.xml b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder2.xml index 777044b2..d3444801 100644 --- a/tests/data/cli/compare/virt-xml-start-select-disk-bootorder2.xml +++ b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder2.xml @@ -29,4 +29,4 @@ <interface type="network"> <mac address="52:54:00:11:fa:28"/> -Domain 'test-state-shutoff' started successfully.
\ No newline at end of file +Domain 'test-state-shutoff' started successfully. diff --git a/tests/data/cli/compare/virt-xml-update-succeed.xml b/tests/data/cli/compare/virt-xml-update-succeed.xml index 6d5070fb..8387aa94 100644 --- a/tests/data/cli/compare/virt-xml-update-succeed.xml +++ b/tests/data/cli/compare/virt-xml-update-succeed.xml @@ -32,4 +32,4 @@ Hotplug this device to the guest 'test'? (y/n): Device hotplug successful. </devices> </domain> -Define 'test' with the changed XML? (y/n): Domain 'test' defined successfully.
\ No newline at end of file +Define 'test' with the changed XML? (y/n): Domain 'test' defined successfully. diff --git a/tests/test_cli.py b/tests/test_cli.py index db061615..124335f8 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -267,12 +267,6 @@ class Command(object): def _check_compare_file(self, conn, output): self.skip_checks.precompare_skip(conn) - # Generate test files that don't exist yet - filename = self.compare_file - if (utils.TESTCONFIG.regenerate_output or - not os.path.exists(filename)): - open(filename, "w").write(output) - if "--print-diff" in self.argv and output.count("\n") > 3: # 1) Strip header # 2) Simplify context lines to reduce churn when @@ -284,7 +278,11 @@ class Command(object): newlines.append(line) output = "\n".join(newlines) - utils.diff_compare(output, filename) + # Make sure all test output has trailing newline, simplifies diffing + if not output.endswith("\n"): + output += "\n" + + utils.diff_compare(output, self.compare_file) self.skip_checks.predefine_skip(conn) |