diff options
author | Simon Rettberg | 2023-05-11 14:48:21 +0200 |
---|---|---|
committer | Simon Rettberg | 2023-05-11 14:48:21 +0200 |
commit | 14aa485f8c00909cceaaee72b813a64de8b98e93 (patch) | |
tree | 04c4907d5aa0b834f4357218b14858ca181e9518 | |
parent | vbox: Add special case for older vbox version files (diff) | |
download | master-sync-shared-14aa485f8c00909cceaaee72b813a64de8b98e93.tar.gz master-sync-shared-14aa485f8c00909cceaaee72b813a64de8b98e93.tar.xz master-sync-shared-14aa485f8c00909cceaaee72b813a64de8b98e93.zip |
vbox: Update tests wrt/ expected xml contents after transformation
3 files changed, 17 insertions, 17 deletions
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox index 9c89f4b..f00c72e 100644 --- a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox +++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?><VirtualBox xmlns="http://www.virtualbox.org/" version="1.16-linux"> - <Machine OSType="Ubuntu_64" lastStateChange="2021-04-28T09:11:13Z" name="Test" snapshotFolder="Snapshots" uuid="{4fa19ba0-f15c-465a-939d-42524c4d133c}"> + <Machine xmlns="http://www.virtualbox.org/" OSType="Ubuntu_64" lastStateChange="2021-04-28T09:11:13Z" name="Test" snapshotFolder="[dummy]" uuid="{}"> <MediaRegistry> <HardDisks> - <HardDisk format="VDI" location="image-default.vmdk" type="Normal" uuid="{ef093a53-6d50-454f-afca-aed47e9f97f9}"/> + <HardDisk format="VDI" location="image-default.vmdk" type="Normal" uuid="{}"/> </HardDisks> </MediaRegistry> - <Hardware uuid="{b36f101a-a45d-41cb-8bd4-3908e75e081b}"> + <Hardware uuid="{}"> <CPU count="1"> <PAE enabled="false"/> <LongMode enabled="true"/> @@ -36,7 +36,7 @@ <StorageController Bootable="true" PortCount="2" name="IDE" type="PIIX4" useHostIOCache="true"/> <StorageController Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3" PortCount="1" name="SATA" type="AHCI" useHostIOCache="false"> <AttachedDevice device="0" hotpluggable="false" port="0" type="HardDisk"> - <Image uuid="{ef093a53-6d50-454f-afca-aed47e9f97f9}"/> + <Image uuid="{}"/> </AttachedDevice> </StorageController> <StorageController Bootable="false" PortCount="1" name="Floppy" type="I82078" useHostIOCache="true"> diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox index 8ca8cde..2717246 100644 --- a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox +++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?><VirtualBox xmlns="http://www.virtualbox.org/" version="1.16-linux"> - <Machine OSType="Ubuntu_64" lastStateChange="2021-04-28T09:11:13Z" name="Test" snapshotFolder="%VM_DISK_REDOLOGDIR%" uuid="%VM_MACHINE_UUID%"> + <Machine xmlns="http://www.virtualbox.org/" OSType="Ubuntu_64" lastStateChange="2021-04-28T09:11:13Z" name="Test" snapshotFolder="[dummy]" uuid="{}"> <MediaRegistry> <HardDisks> - <HardDisk format="VDI" location="%VM_DISK_PATH%" type="Normal" uuid="%VM_HDD_UUID_0%"/> + <HardDisk format="VDI" location="[dummy]" type="Normal" uuid="{}"/> </HardDisks> </MediaRegistry> - <Hardware uuid="{b36f101a-a45d-41cb-8bd4-3908e75e081b}"> - <CPU count="%VM_CPU_CORES%"> + <Hardware uuid="{}"> + <CPU> <PAE enabled="false"/> <LongMode enabled="true"/> <X2APIC enabled="true"/> <HardwareVirtExLargePages enabled="false"/> </CPU> - <Memory RAMSize="%VM_RAM%"/> + <Memory RAMSize="1024"/> <Display VRAMSize="16" controller="VMSVGA"/> <BIOS> <IOAPIC enabled="true"/> @@ -24,7 +24,7 @@ </Controllers> </USB> <Network> - <Adapter MACAddress="%VM_NIC_MAC%" enabled="true" slot="0" type="82540EM"> + <Adapter MACAddress="080027E05495" enabled="true" slot="0" type="82540EM"> <HostOnlyInterface name="vboxnet1"/> </Adapter> </Network> @@ -36,7 +36,7 @@ <StorageController Bootable="true" PortCount="2" name="IDE" type="PIIX4" useHostIOCache="true"/> <StorageController Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3" PortCount="1" name="SATA" type="AHCI" useHostIOCache="false"> <AttachedDevice device="0" hotpluggable="false" port="0" type="HardDisk"> - <Image uuid="%VM_HDD_UUID_0%"/> + <Image uuid="{}"/> </AttachedDevice> </StorageController> </StorageControllers> diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-privacy.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-privacy.vbox index 00a5a7c..cfe0fc1 100644 --- a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-privacy.vbox +++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-privacy.vbox @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?><VirtualBox xmlns="http://www.virtualbox.org/" version="1.16-linux"> - <Machine OSType="Ubuntu_64" lastStateChange="2021-04-28T09:11:13Z" name="ubuntu" snapshotFolder="Snapshots" uuid="%VM_MACHINE_UUID%"> + <Machine xmlns="http://www.virtualbox.org/" OSType="Ubuntu_64" lastStateChange="2021-04-28T09:11:13Z" name="ubuntu" snapshotFolder="[dummy]" uuid="{b36f101a-a45d-41cb-8bd4-3908e75e081b}"> <MediaRegistry> <HardDisks> - <HardDisk format="VDI" location="%VM_HDD_LOCATION%" type="Normal" uuid="%VM_HDD_UUID_0%"/> + <HardDisk format="VDI" location="[dummy]" type="Normal" uuid="{46282ce8-090a-4219-87f2-c1700bd0ce6a}"/> </HardDisks> </MediaRegistry> <Hardware uuid="{b36f101a-a45d-41cb-8bd4-3908e75e081b}"> - <CPU count="%VM_CPU_CORES%"> + <CPU> <PAE enabled="false"/> <LongMode enabled="true"/> <X2APIC enabled="true"/> <HardwareVirtExLargePages enabled="false"/> </CPU> - <Memory RAMSize="%VM_RAM%"/> + <Memory RAMSize="1024"/> <Display VRAMSize="16" controller="VMSVGA"/> <BIOS> <IOAPIC enabled="true"/> @@ -24,7 +24,7 @@ </Controllers> </USB> <Network> - <Adapter MACAddress="%VM_NIC_MAC%" enabled="true" slot="0" type="82540EM"/> + <Adapter MACAddress="080027E05495" enabled="true" slot="0" type="82540EM"/> </Network> <AudioAdapter codec="AD1980" driver="Pulse" enabled="true" enabledIn="false"/> <RTC localOrUTC="UTC"/> @@ -34,7 +34,7 @@ <StorageController Bootable="true" PortCount="2" name="IDE" type="PIIX4" useHostIOCache="true"/> <StorageController Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3" PortCount="1" name="SATA" type="AHCI" useHostIOCache="false"> <AttachedDevice device="0" hotpluggable="false" port="0" type="HardDisk"> - <Image uuid="%VM_HDD_UUID_0%"/> + <Image uuid="{46282ce8-090a-4219-87f2-c1700bd0ce6a}"/> </AttachedDevice> </StorageController> </StorageControllers> |