>From b7fc8b21fb3cdd9fefffd05d12dabfd055032f8f Mon Sep 17 00:00:00 2001
From: pradeep <you@xxxxxxxxxxx>
Date: Thu, 29 Sep 2011 11:22:32 +0530
Subject: [PATCH] [KVM][Autotest]: watchdog test extension
Signed-off-by: Pradeep K Surisetty <psuriset@xxxxxxxxxxxxxxxxxx>
modified: client/tests/kvm/subtests.cfg.sample
modified: client/virt/tests/watchdog.py
---
client/tests/kvm/subtests.cfg.sample | 2 ++
client/virt/tests/watchdog.py | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/client/tests/kvm/subtests.cfg.sample b/client/tests/kvm/subtests.cfg.sample
index e4f6718..79a6d8b 100644
--- a/client/tests/kvm/subtests.cfg.sample
+++ b/client/tests/kvm/subtests.cfg.sample
@@ -363,6 +363,8 @@ variants:
only RHEL.5, RHEL.6
type = watchdog
extra_params += " -watchdog i6300esb -watchdog-action reset"
+ #watchdog device: i6300esb|ib700
+ #watchdog-actions: reset|shutdown|poweroff|pause|debug
relogin_timeout = 240
- smbios_table: install setup image_copy unattended_install.cdrom
diff --git a/client/virt/tests/watchdog.py b/client/virt/tests/watchdog.py
index 446f250..2a19c7b 100644
--- a/client/virt/tests/watchdog.py
+++ b/client/virt/tests/watchdog.py
@@ -17,10 +17,10 @@ def run_watchdog(test, params, env):
relogin_timeout = int(params.get("relogin_timeout", 240))
watchdog_enable_cmd = "chkconfig watchdog on && service watchdog start"
- def watchdog_action_reset():
+ def watchdog_action():
"""
Trigger a crash dump through sysrq-trigger
- Ensure watchdog_action(reset) occur.
+ Ensure watchdog_action occur.
"""
session = vm.wait_for_login(timeout=timeout)
@@ -37,7 +37,7 @@ def run_watchdog(test, params, env):
logging.info("Enabling watchdog service...")
session.cmd(watchdog_enable_cmd, timeout=320)
- watchdog_action_reset()
+ watchdog_action()
# Close stablished session
session.close()
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
