提交 f752dd3b 编写于 作者: X Xu Tian

Merge pull request #640 from suqinhuang/suppress_excep

Fix error of suppress_exception value
......@@ -43,22 +43,22 @@
variants:
- with_stop_continue:
sub_test = stop_continue
suppress_exception = False
suppress_exception = no
- with_shutdown:
sub_test = shutdown
suppress_exception = True
suppress_exception = yes
shutdown_method = shell
- with_reboot:
sub_test = boot
suppress_exception = True
suppress_exception = yes
reboot_count = 1
reboot_method = shell
- with_system_reset:
sub_test = boot
suppress_exception = True
suppress_exception = yes
reboot_method = system_reset
sleep_before_reset = 20
- with_live_migration:
sub_test = migration
suppress_exception = False
suppress_exception = no
migration_test_command = ver && vol
......@@ -4,7 +4,7 @@
kill_vm_on_error = yes
check_guest_bsod = yes
login_timeout = 240
suppress_exception = False
suppress_exception = no
driver_load_cmd = C:\devcon.exe enable @DRIVER_ID
driver_unload_cmd = C:\devcon.exe disable @DRIVER_ID
driver_id_cmd = C:\devcon.exe find * | find "VirtIO"
......
......@@ -31,28 +31,28 @@
variants:
- with_stop_continue:
sub_test = stop_continue
suppress_exception = False
suppress_exception = no
- with_shutdown:
sub_test = shutdown
suppress_exception = True
suppress_exception = yes
shutdown_method = shell
- with_reboot:
sub_test = boot
suppress_exception = True
suppress_exception = yes
reboot_count = 1
reboot_method = shell
- with_system_reset:
sub_test = boot
suppress_exception = True
suppress_exception = yes
reboot_method = system_reset
sleep_before_reset = 20
- with_live_migration:
sub_test = migration
suppress_exception = False
suppress_exception = no
migration_test_command = ver && vol
- with_hotplug:
sub_test = pci_hotplug
suppress_exception = False
suppress_exception = no
pci_type = nic
pci_model = virtio-net-pci
match_string = "Virtio network device"
......
......@@ -96,7 +96,7 @@ def run(test, params, env):
sub_type = params["sub_test"]
bg_stress_test = params["run_bgstress"]
wait_time = float(params.get("wait_bg_time", 60))
suppress_exception = bool(params.get("suppress_exception", "no"))
suppress_exception = params.get("suppress_exception", "no") == "yes"
error_context.context("Run sub test %s %s" % (sub_type, run_bg_flag),
logging.info)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册