From 023305da185b4f9368bb640d8ef9596bdf02afbb Mon Sep 17 00:00:00 2001 From: Qingtang Zhou Date: Wed, 8 May 2013 01:20:42 +0800 Subject: [PATCH] qemu.tests.cdrom: Rename max_times to cdrom_max_test_times To avoid possible conflict with other tests. Signed-off-by: Qingtang Zhou Acked-by: Xu Tian --- qemu/tests/cdrom.py | 4 ++-- qemu/tests/cfg/cdrom_test.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu/tests/cdrom.py b/qemu/tests/cdrom.py index c87edf8b..03350ca3 100644 --- a/qemu/tests/cdrom.py +++ b/qemu/tests/cdrom.py @@ -494,11 +494,11 @@ def run_cdrom(test, params, env): " unlocked" % (qemu_cdrom_device)) del _f - max_times = int(params.get("max_times", 100)) + max_test_times = int(params.get("cdrom_max_test_times", 100)) if params.get("cdrom_test_eject") == "yes": eject_test_via_monitor(vm, qemu_cdrom_device, guest_cdrom_device, self.iso_image_orig, - self.iso_image_new, max_times) + self.iso_image_new, max_test_times) if params.get('cdrom_test_tray_status') == 'yes': check_tray_status_test(vm, qemu_cdrom_device, diff --git a/qemu/tests/cfg/cdrom_test.cfg b/qemu/tests/cfg/cdrom_test.cfg index a3947581..0db823ec 100644 --- a/qemu/tests/cfg/cdrom_test.cfg +++ b/qemu/tests/cfg/cdrom_test.cfg @@ -4,7 +4,7 @@ cdrom_cd1 = orig.iso start_vm = no kill_vm_on_error = yes - max_times = 20 + cdrom_max_test_times = 20 # test whether cdrom is unlocked <300s after boot cdrom_test_autounlock = no # test the tray status -- GitLab