提交 8f86eaca 编写于 作者: M Matthias Bolte

virt-aa-helper-test: Fix failure due to the new disk format probing option

Commit 68719c4b added the disk format
probing option. This makes virt-aa-helper-test fail because the domain
config didn't specifiy the disk format and it didn't pass '-p 1' to
virt-aa-helper to allow disk format probing.

Specify the disk format in the domain config. Pass the '-p 1' option
to virt-aa-helper for the test case with two disks. This way this test
also covers this new option.
上级 d01340e7
...@@ -76,6 +76,7 @@ cat > "$template_xml" <<EOM ...@@ -76,6 +76,7 @@ cat > "$template_xml" <<EOM
<devices> <devices>
<emulator>/usr/bin/kvm</emulator> <emulator>/usr/bin/kvm</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='###DISK###'/> <source file='###DISK###'/>
<target dev='hda' bus='ide'/> <target dev='hda' bus='ide'/>
</disk> </disk>
...@@ -195,7 +196,7 @@ cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | ...@@ -195,7 +196,7 @@ cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" |
testme "0" "create (ppc)" "-c -u $valid_uuid" "$test_xml" testme "0" "create (ppc)" "-c -u $valid_uuid" "$test_xml"
cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | sed "s,</disk>,</disk><disk type='file' device='disk'><source file='$disk2'/><target dev='hdb' bus='ide'/></disk>,g" > "$test_xml" cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | sed "s,</disk>,</disk><disk type='file' device='disk'><source file='$disk2'/><target dev='hdb' bus='ide'/></disk>,g" > "$test_xml"
testme "0" "create multiple disks" "-c -u $valid_uuid" "$test_xml" testme "0" "create multiple disks" "-c -u $valid_uuid -p 1" "$test_xml"
cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###',${disk1}'/><readonly,g" > "$test_xml" cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###',${disk1}'/><readonly,g" > "$test_xml"
testme "0" "create (readonly)" "-c -u $valid_uuid" "$test_xml" testme "0" "create (readonly)" "-c -u $valid_uuid" "$test_xml"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册