From patchwork Thu May 6 05:14:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 97269 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o465ERAt026976 for ; Thu, 6 May 2010 05:14:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751939Ab0EFFOZ (ORCPT ); Thu, 6 May 2010 01:14:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3072 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750846Ab0EFFOY (ORCPT ); Thu, 6 May 2010 01:14:24 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o465ENYP011758 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 6 May 2010 01:14:23 -0400 Received: from localhost.localdomain (vpn-8-147.rdu.redhat.com [10.11.8.147]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o465EL4Q016552; Thu, 6 May 2010 01:14:21 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: guest_s4 subtest - Expose timeout on config Date: Thu, 6 May 2010 02:14:19 -0300 Message-Id: <1273122859-19797-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 06 May 2010 05:14:27 +0000 (UTC) diff --git a/client/tests/kvm/tests/guest_s4.py b/client/tests/kvm/tests/guest_s4.py index a289148..88b2b7c 100644 --- a/client/tests/kvm/tests/guest_s4.py +++ b/client/tests/kvm/tests/guest_s4.py @@ -58,8 +58,9 @@ def run_guest_s4(test, params, env): raise error.TestError("Failed to start VM after suspend to disk") # Log into the resumed VM - logging.info("Logging into resumed VM...") - session2 = kvm_utils.wait_for(vm.remote_login, 120, 0, 2) + relogin_timeout = int(params.get("relogin_timeout", 240)) + logging.info("Logging into resumed VM, timeout %s", relogin_timeout) + session2 = kvm_utils.wait_for(vm.remote_login, relogin_timeout, 0, 2) if not session2: raise error.TestFail("Could not log into VM after resuming from " "suspend to disk") diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index ee83ac2..21ffa56 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -227,6 +227,7 @@ variants: set_s4_cmd = echo disk > /sys/power/state kill_test_s4_cmd = pkill tcpdump services_up_timeout = 30 + relogin_timeout = 240 - nic_hotplug: install setup unattended_install type = pci_hotplug