From patchwork Mon Mar 2 18:19:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184111 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2704496ile; Mon, 2 Mar 2020 10:22:57 -0800 (PST) X-Google-Smtp-Source: ADFU+vsCsQNvcEs5aU17GX51qoqcnL13AzE7GP4Hx8OO/WdnC+UTwG306mQfXqagcFBxzQ8IkDak X-Received: by 2002:a37:7c47:: with SMTP id x68mr577014qkc.8.1583173377205; Mon, 02 Mar 2020 10:22:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173377; cv=none; d=google.com; s=arc-20160816; b=o4npbAdLl7RVFx8JUNe/FfoEa8fLkrgn7R+3s1HLPj52c0mIPJnnctqYSi0jd1HXc7 4UWX1Hj+Rjr/lP+fMQs6CaqEOBIQQytF8MQwkX0kX2Bxtb0tpd9DHC2ZC9At0D3yCiHN ZUMfUKwnELhRQxqi5cSghKIXyBZFEuUbxVfU+DDXgxYaQmZcRh63WJ5CNHJUvZev5nKA e9Icy5KKHdinwBUDRh4ccJ53cckRSJ74071FGPwZAToS+KvCDchiap0uNeafqKT896E6 0XxgaGZnsLjBEhjWagM2Go6vTg2652mzhWUPhTJB+PeLdtm1r29zqMcVB37SJcNwjQq3 1d/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=dCr0Z8PfAqS4rx+S0HXKAf2zVkW9ZlqRt2oF49qU2FA=; b=byILJkAAw3XerZaPKju5iznVAvPOZfX2byM0TS0ipOdD/xWgGxXHvwWmug2lOfJd/Q wq46Gp6uR89Qp+yDdGgC8M2XNjxunuUUsGTmU/bASgsIrfKXUZAJnpxGsfc9h2npCiBN il8Os5kyI2UCggBNunJUTlDmZUXZ7x0P4nKgUoiohX+lwXLvwFFX81zbfUjtW7aNV77L JefkIywB3Ny8bl8vPbYACtmgPjoW/f5pnalqNkV8n+7zZdQrx3W32tFBi2ep1Rri5umI e/CTzE+OdNTR9oUHW9LCvFwcJwLEsuNDPoi5/x+TzPv57ZG0qjE3Hc+vbMfDxQ0DmZKO ts2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ggzu6F2R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w12si6334380qtn.272.2020.03.02.10.22.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:22:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ggzu6F2R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8piS-00019e-OH for patch@linaro.org; Mon, 02 Mar 2020 13:22:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43615) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002Xr-Tp for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfC-0001EI-Fr for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:38158) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfC-00019i-9E for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: by mail-wr1-x429.google.com with SMTP id t11so983931wrw.5 for ; Mon, 02 Mar 2020 10:19:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dCr0Z8PfAqS4rx+S0HXKAf2zVkW9ZlqRt2oF49qU2FA=; b=ggzu6F2Rbxl79fGhkDUyBM16K3abHaWTrABJHewKUCzSaJpB2PrWdvtwayeO1tS2J+ VNqqEXu+aODvWEB7gfrsBLU0NcA6QZqZ8uBos+K6UA55MkQVPGZ3M5BfwX304QN40L+4 kcyapHCEi9Cxa78lv1k5ltur2Hk+q91+hfp3auxUGaC/9NdEsAGR40vOEN47L7kzRbS0 o/Dit0bfq3HL7wgzzEVQmnuxzZRBQggBAf2mOFDbYW/56y5lbKyROgb4skB0PJ3i/4Q/ cWYEBQ3qHdTe4uzJy+nFA2sfTfZNrRXe6dhO8fe2r40H+DWU1XQshlHlJBXY7S2j5h8z 9vhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dCr0Z8PfAqS4rx+S0HXKAf2zVkW9ZlqRt2oF49qU2FA=; b=tGkEM8+o/tU69PYBHFWk73sd04ugW3H/NjIC5BN/KbfoHossvHGNMB51wnkh2QpbjC Gscxl5tO29W7qOAcz8b7A4iXk/OwJ0w/wALGmh+WPUjdyhVvNAdP3FRF4vkwtSTgvGiU NQBfPgclpUjjJ+iJOrECvMHm5dRhWdMADk8HcV9xVDiohlvaVYl7NUlljz07u5wN+82J ZSssvKU/L/6tf3BdVZFvkNNl2tJRwqQjgIwx4bAK6gbh/fad/QLF9OtrnufuPOwXvpNW /4KLqShxKkDuMi0oALCzQ2utRNhLfWxZXik2AvObarQhRpx+PsxTpmRkTXNRSIvBQVvh rk4w== X-Gm-Message-State: ANhLgQ3LhcHSUq7cKSG6k7lcegzfZ1BLPhQID42a+GnA7r/YrnEXSqe3 t1PgkzWIbkYiPA/6pwUBbicwiw== X-Received: by 2002:a05:6000:4b:: with SMTP id k11mr805024wrx.362.1583173153067; Mon, 02 Mar 2020 10:19:13 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z12sm2842292wrs.43.2020.03.02.10.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:09 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BE5841FF90; Mon, 2 Mar 2020 18:19:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/10] tests/vm: increased max timeout for vm boot. Date: Mon, 2 Mar 2020 18:19:00 +0000 Message-Id: <20200302181907.32110-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Puhov , =?utf-8?q?Alex_Benn=C3=A9e?= , Robert Foley , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley Add change to increase timeout waiting for VM to boot. Needed for some emulation cases where it can take longer than 5 minutes to boot. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Reviewed-by: Peter Puhov Signed-off-by: Alex Bennée Message-Id: <20200219163537.22098-4-robert.foley@linaro.org> --- tests/vm/basevm.py | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index c99725b8c0d..5ca445e29af 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -57,6 +57,10 @@ class BaseVM(object): poweroff = "poweroff" # enable IPv6 networking ipv6 = True + # Scale up some timeouts under TCG. + # 4 is arbitrary, but greater than 2, + # since we found we need to wait more than twice as long. + tcg_ssh_timeout_multiplier = 4 def __init__(self, debug=False, vcpus=None): self._guest = None self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-", @@ -309,6 +313,9 @@ class BaseVM(object): sys.stderr.write("### %s ...\n" % text) def wait_ssh(self, seconds=300): + # Allow more time for VM to boot under TCG. + if not kvm_available(self.arch): + seconds *= self.tcg_ssh_timeout_multiplier starttime = datetime.datetime.now() endtime = starttime + datetime.timedelta(seconds=seconds) guest_up = False