proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-04-29 06:45:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: use valid machine types for snapshot tests

Browse Source 
In preparation to turn the 'machine' parameter into a property string.

parse_property_string checks for the regex, therefore the test-cases
with 'somemachine' and 'someothermachine' would fail.

To avoid that, replace 'somemachine' and 'someothermachine' with 'q35'
and 'pc' with sed:

sed -i 's/somemachine/q35/g'
sed -i 's/someothermachine/pc/g'

Signed-off-by: Markus Frank <m.frank@proxmox.com>
[FE: improve wording in commit message]
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Markus Frank 2023-01-18 14:57:56 +01:00 committed by Fiona Ebner
parent a55d0f71b2
commit d6989068fa
47 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/snapshot-expected/commit/qemu-server/101.conf
View File

@ -18,7 +18,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/commit/qemu-server/102.conf
View File

@ -34,7 +34,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/commit/qemu-server/201.conf
View File

@ -34,7 +34,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/commit/qemu-server/202.conf
View File

@ -35,7 +35,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/commit/qemu-server/203.conf
View File

@ -35,7 +35,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/create/qemu-server/102.conf
View File

@ -25,7 +25,7 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1

4
test/snapshot-expected/create/qemu-server/104.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
@ -45,7 +45,7 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1

2
test/snapshot-expected/create/qemu-server/106.conf
View File

@ -25,7 +25,7 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1

2
test/snapshot-expected/create/qemu-server/301.conf
View File

@ -25,7 +25,7 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1

2
test/snapshot-expected/create/qemu-server/302.conf
View File

@ -25,7 +25,7 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1

2
test/snapshot-expected/delete/qemu-server/203.conf
View File

@ -21,7 +21,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/delete/qemu-server/204.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/prepare/qemu-server/102.conf
View File

@ -23,7 +23,7 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snapstate: prepare
snaptime: 1234567890

2
test/snapshot-expected/prepare/qemu-server/104.conf
View File

@ -41,7 +41,7 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snapstate: prepare
snaptime: 1234567890

2
test/snapshot-expected/rollback/qemu-server/101.conf
View File

@ -21,7 +21,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

4
test/snapshot-expected/rollback/qemu-server/106.conf
View File

@ -3,7 +3,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
@ -21,7 +21,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/rollback/qemu-server/201.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/rollback/qemu-server/202.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:unsnapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/rollback/qemu-server/203.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/rollback/qemu-server/204.conf
View File

@ -21,7 +21,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/rollback/qemu-server/205.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/rollback/qemu-server/301.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-expected/rollback/qemu-server/302.conf
View File

@ -27,7 +27,7 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1

2
test/snapshot-expected/rollback/qemu-server/303.conf
View File

@ -26,7 +26,7 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1

2
test/snapshot-input/commit/qemu-server/101.conf
View File

@ -18,7 +18,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/commit/qemu-server/102.conf
View File

@ -35,7 +35,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/commit/qemu-server/201.conf
View File

@ -34,7 +34,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/commit/qemu-server/202.conf
View File

@ -35,7 +35,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/commit/qemu-server/203.conf
View File

@ -35,7 +35,7 @@ bootdisk: ide0
cores: 4
ide0: somestore:somedisk,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/create/qemu-server/104.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/delete/qemu-server/101.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/delete/qemu-server/203.conf
View File

@ -21,7 +21,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/delete/qemu-server/204.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/101.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/102.conf
View File

@ -4,7 +4,7 @@ bootdisk: ide2
cores: 2
ide0: local:snapshotable-disk-1,size=32G
ide2: none,media=cdrom
machine: someothermachine
machine: pc
memory: 4096
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/103.conf
View File

@ -4,7 +4,7 @@ bootdisk: ide2
cores: 2
ide0: local:snapshotable-disk-1,size=32G
ide2: none,media=cdrom
machine: someothermachine
machine: pc
memory: 4096
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/104.conf
View File

@ -4,7 +4,7 @@ bootdisk: ide2
cores: 2
ide0: local:snapshotable-disk-1,size=32G
ide2: none,media=cdrom
machine: someothermachine
machine: pc
memory: 4096
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

4
test/snapshot-input/rollback/qemu-server/106.conf
View File

@ -3,7 +3,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: someothermachine
machine: pc
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
@ -21,7 +21,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/201.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/202.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:unsnapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/203.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/204.conf
View File

@ -21,7 +21,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/205.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/301.conf
View File

@ -20,7 +20,7 @@ bootdisk: ide0
cores: 4
ide0: local:snapshotable-disk-1,discard=on,size=32G
ide2: none,media=cdrom
machine: somemachine
machine: q35
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1

2
test/snapshot-input/rollback/qemu-server/302.conf
View File

@ -26,7 +26,7 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1

2
test/snapshot-input/rollback/qemu-server/303.conf
View File

@ -26,7 +26,7 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
runningmachine: somemachine
runningmachine: q35
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1

2
test/snapshot-test.pm
View File

@ -305,7 +305,7 @@ sub __snapshot_save_vmstate {
my $snap = $conf->{snapshots}->{$snapname};
$snap->{vmstate} = "somestorage:state-volume";
$snap->{runningmachine} = "somemachine"
$snap->{runningmachine} = "q35"
}
sub assert_config_exists_on_node {