From patchwork Tue Jan 11 17:49:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 472211 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 p0BHo9Bi019461 for ; Tue, 11 Jan 2011 17:50:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932515Ab1AKRuE (ORCPT ); Tue, 11 Jan 2011 12:50:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64596 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932510Ab1AKRuC (ORCPT ); Tue, 11 Jan 2011 12:50:02 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0BHo1jj024621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 11 Jan 2011 12:50:02 -0500 Received: from freedom.redhat.com (vpn-10-242.rdu.redhat.com [10.11.10.242]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p0BHnxov015847; Tue, 11 Jan 2011 12:50:00 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues , Michael Goldish Subject: [KVM-AUTOTEST,08/26] KVM test: unattended_install.py style changes Date: Tue, 11 Jan 2011 15:49:57 -0200 Message-Id: <1294768197-24004-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 11 Jan 2011 17:50:10 +0000 (UTC) diff --git a/client/tests/kvm/tests/unattended_install.py b/client/tests/kvm/tests/unattended_install.py index fdb020a..45dfdbb 100644 --- a/client/tests/kvm/tests/unattended_install.py +++ b/client/tests/kvm/tests/unattended_install.py @@ -1,6 +1,6 @@ import logging, time, socket, re from autotest_lib.client.common_lib import error -import kvm_utils, kvm_test_utils +import kvm_utils, kvm_test_utils, kvm_vm def run_unattended_install(test, params, env): @@ -13,45 +13,32 @@ def run_unattended_install(test, params, env): @param params: Dictionary with the test parameters. @param env: Dictionary with test environment. """ - buf = 1024 vm = env.get_vm(params["main_vm"]) vm.verify_alive() + install_timeout = int(params.get("timeout", 3000)) + post_install_delay = int(params.get("post_install_delay", 0)) port = vm.get_port(int(params.get("guest_port_unattended_install"))) - if params.get("post_install_delay"): - post_install_delay = int(params.get("post_install_delay")) - else: - post_install_delay = 0 - install_timeout = float(params.get("timeout", 3000)) migrate_background = params.get("migrate_background") == "yes" if migrate_background: mig_timeout = float(params.get("mig_timeout", "3600")) mig_protocol = params.get("migration_protocol", "tcp") - logging.info("Starting unattended install watch process. " - "Timeout set to %ds (%d min)", install_timeout, - install_timeout/60) + logging.info("Waiting for installation to finish. Timeout set to %ds " + "(%d min).", install_timeout, install_timeout/60) + error.context("waiting for installation to finish") + start_time = time.time() - time_elapsed = 0 - while time_elapsed < install_timeout: - if not vm.is_alive(): - raise error.TestError("Guest died before end of OS install") + while (time.time() - start_time) < install_timeout: + vm.verify_alive() client = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - addr = vm.get_address() - if addr is not None: - try: - client.connect((addr, port)) - msg = client.recv(1024) - if msg == 'done': - if post_install_delay: - logging.debug("Post install delay specified, " - "waiting %ss...", post_install_delay) - time.sleep(post_install_delay) - break - except socket.error: - pass - + try: + client.connect((vm.get_address(), port)) + if client.recv(1024) == "done": + break + except (socket.error, kvm_vm.VMAddressError): + pass if migrate_background: # Drop the params which may break the migration # Better method is to used dnsmasq to do the unattended installation @@ -66,12 +53,15 @@ def run_unattended_install(test, params, env): else: time.sleep(1) client.close() - end_time = time.time() - time_elapsed = int(end_time - start_time) - - if time_elapsed < install_timeout: - logging.info('Guest reported successful installation after %ds ' - '(%d min)', time_elapsed, time_elapsed/60) else: raise error.TestFail('Timeout elapsed while waiting for install to ' 'finish.') + + time_elapsed = time.time() - start_time + logging.info("Guest reported successful installation after %ds (%d min)", + time_elapsed, time_elapsed/60) + + if post_install_delay: + logging.debug("Post install delay specified, waiting %ss...", + post_install_delay) + time.sleep(post_install_delay)