From patchwork Mon Dec 27 16:01:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 434311 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRKCV9S025997 for ; Mon, 27 Dec 2010 20:16:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754332Ab0L0QCK (ORCPT ); Mon, 27 Dec 2010 11:02:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32218 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754326Ab0L0QCJ (ORCPT ); Mon, 27 Dec 2010 11:02:09 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG29Qx025782 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 11:02:09 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBRG28xf003524; Mon, 27 Dec 2010 11:02:08 -0500 Received: from moof.tlv.redhat.com (dhcp-1-185.tlv.redhat.com [10.35.1.185]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG1rFp017175; Mon, 27 Dec 2010 11:02:07 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 03/28] KVM test: corrections to migration_with_reboot Date: Mon, 27 Dec 2010 18:01:30 +0200 Message-Id: <1293465715-16599-3-git-send-email-mgoldish@redhat.com> In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> References: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 20:16:52 +0000 (UTC) diff --git a/client/tests/kvm/tests/migration_with_reboot.py b/client/tests/kvm/tests/migration_with_reboot.py index 5673b45..5070dbc 100644 --- a/client/tests/kvm/tests/migration_with_reboot.py +++ b/client/tests/kvm/tests/migration_with_reboot.py @@ -24,7 +24,7 @@ def run_migration_with_reboot(test, params, env): password, prompt, linesep, log_filename, timeout): """ A version of reboot test which is safe to be called in the background as - it only needs an vm object + it doesn't need a VM object. """ # Send a reboot command to the guest's shell session.sendline(reboot_command) @@ -37,12 +37,12 @@ def run_migration_with_reboot(test, params, env): session.close() # Try logging into the guest until timeout expires - logging.info("Guest is down. Waiting for it to go up again, timeout %ds", - timeout) - session = kvm_utils.remote_login(client, address, port, username, - password, prompt, linesep, - log_filename, timeout) - + logging.info("Guest is down. Waiting for it to go up again, timeout " + "%ds", timeout) + session = kvm_utils.wait_for( + lambda: kvm_utils.remote_login(client, address, port, username, + password, prompt, linesep, + log_filename), timeout, 0, 2) if not session: raise error.TestFail("Could not log into guest after reboot") logging.info("Guest is up again") @@ -53,16 +53,16 @@ def run_migration_with_reboot(test, params, env): session = kvm_test_utils.wait_for_login(vm, timeout=timeout) # params of reboot - username = params.get("username", "") - password = params.get("password", "") - prompt = params.get("shell_prompt", "[\#\$]") - linesep = eval("'%s'" % params.get("shell_linesep", r"\n")) - client = params.get("shell_client") + username = vm.params.get("username", "") + password = vm.params.get("password", "") + prompt = vm.params.get("shell_prompt", "[\#\$]") + linesep = eval("'%s'" % vm.params.get("shell_linesep", r"\n")) + client = vm.params.get("shell_client") address = vm.get_address(0) port = vm.get_port(int(params.get("shell_port"))) log_filename = ("migration-reboot-%s-%s.log" % (vm.name, kvm_utils.generate_random_string(4))) - reboot_command = params.get("reboot_command") + reboot_command = vm.params.get("reboot_command") mig_timeout = float(params.get("mig_timeout", "3600")) mig_protocol = params.get("migration_protocol", "tcp")