From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pradeep Kumar Subject: [Autotest] [PATCH]: watchdog test extension Date: Thu, 29 Sep 2011 13:26:07 +0530 Message-ID: <20110929075607.12408.33257.sendpatchset@skywalker> Cc: Pradeep Kumar To: KVM , Lucas Meneghel Rodrigues Return-path: Received: from e8.ny.us.ibm.com ([32.97.182.138]:46522 "EHLO e8.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754256Ab1I2H4S (ORCPT ); Thu, 29 Sep 2011 03:56:18 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e8.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p8T7fEre000300 for ; Thu, 29 Sep 2011 03:41:14 -0400 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p8T7uBAq255724 for ; Thu, 29 Sep 2011 03:56:11 -0400 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p8T7uAqk019163 for ; Thu, 29 Sep 2011 01:56:10 -0600 Sender: kvm-owner@vger.kernel.org List-ID: >>From b7fc8b21fb3cdd9fefffd05d12dabfd055032f8f Mon Sep 17 00:00:00 2001 From: pradeep Date: Thu, 29 Sep 2011 11:22:32 +0530 Subject: [PATCH] [KVM][Autotest]: watchdog test extension Signed-off-by: Pradeep K Surisetty 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