From patchwork Wed Mar 4 10:01:48 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: 184163 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4707476ile; Wed, 4 Mar 2020 02:04:55 -0800 (PST) X-Google-Smtp-Source: ADFU+vvPNOG7rkF7d9OkIScaGAUq8CMoaPlh66hsyrRbOHXKbaiPmQiT3Sr4uVqa10OBmoQOWN1H X-Received: by 2002:ac8:7101:: with SMTP id z1mr1537389qto.333.1583316295490; Wed, 04 Mar 2020 02:04:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316295; cv=none; d=google.com; s=arc-20160816; b=oa9s8fOkSTWJ2pxhF5Ds3TBiosP0rUF55R2dAIxggfDUHsfCpNB0LYNy2pg+yJNS2V 3RXyrDLq/s0I/kjyK3SwIurfU0agZuyZbAg9SLiExiUdeeQ9Q2nYwGYWSDhR+Qn+SR47 giGIU3/4T/aBmTRlvd/PmUbsWl/z91D8Kv0cTtvkRHooE1fmYO1kbGWWvYpJ5m6INEvg w8LCWLCzpgUmuK3yx8sV8ICzI8x9YWyGDpStGtHURZzORtpiSLSUnBBcDAkAgLC+R9Oe E/FsH+EtlxXVzOIxSShiyd9e18Z6V14pf055GVxJPLustPO6SQh64G0DNCKdY2Zy7KFz T5nQ== 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=1qnpQiuLu8k4ZAfo7VfU1hbr6iwSq3LWEeDvjeoy05s=; b=rQQEMOux4Evopa4e/GDpT0lIWUj2wKh75WQ77wcrA0EVLDBVdMCasZary0DJimAQnV kf8hAnga33eHG7bFjArb0VqtRaCiZsTfrScZ+jJ+2CwobF4Cba56YWcEaY4+gneQie0t vQ9JMIlEIM6gwcnr2PDLZzPWs/oWfURf9i4kf8PRVHVt1COBHW5MPBlRDT462TnFQ1hj kLcw2sZH3S14b/fsa3OuGzRYOdD7EcSDLhWXNYtC7UZH5jjTbuNzgRYsKj9OQmLIyaM9 MSBlDNb7qRrKcx1LwBVgorTxKLV/Mz4ZBadIdqLSh3RVTIufI38kzLPpFDdK2+MmAUP0 g5Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WTQsFK8Z; 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 p20si714245qtl.205.2020.03.04.02.04.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:04:55 -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=WTQsFK8Z; 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]:60008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qtb-00036y-10 for patch@linaro.org; Wed, 04 Mar 2020 05:04:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41635) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqo-0006zq-R1 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqn-0000Rp-Da for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:02 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqn-0000Q6-6r for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:01 -0500 Received: by mail-wr1-x435.google.com with SMTP id y17so1599309wrn.6 for ; Wed, 04 Mar 2020 02:02:01 -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=1qnpQiuLu8k4ZAfo7VfU1hbr6iwSq3LWEeDvjeoy05s=; b=WTQsFK8ZOUYiEx2SWDgvMUQif2MGXcPuGbUv2uehID1FM78IXF4OSq7y5hCfllxJzZ I7v20CB48BnOK4BYY2jmGmr0NWJ2pEoBbRat5zoVONGRYxhK4Pdv09kQGdxCeuhoSVXC OTnBEvlEmNUo9BPM4IyYrSkxxd8fO57PNkvZCHIAyD1Z1iPUf02FaSK1GF3HBCqxIGsK e3CwngXPS5WeY3SU4r3FhOKUOpXctMhj4p1lGCQLbdP19B1rkQ9Rp9FxMT2k25N5b6v7 1hfimFpj+yeKNW/LxlxpvB2hD6ElDtJ51s5xS7KIMS6fRABHwsDncEWHQ/6UOmynoIKl SY9w== 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=1qnpQiuLu8k4ZAfo7VfU1hbr6iwSq3LWEeDvjeoy05s=; b=GXtdjEbWKOuW1/P9wEtMyu5+PDNIBy9istpR1txLJsFezaHlJriXk5oPS6ica4e77j zhIyriJz5ZdJ3yAe0eoaxvg8l3oafyunJXyBUu7Muqg0Qr7u3iVUHgXIAULXauwTvBUt 8X2BCIXeKVQHC+uJlbnWrFFS0Pues08IFzwYFCM6CBZhKPuH+DjaVKbq6T5AaEvPnfo6 9ru/RCDYjGPo2KKJ1iOlkri6mg/2zd/aplmf0xSIjk80Z0kUWe61cKkaEo49vfUPzmNM kGWopNcEwRZWBPlJRRyG/iFY+guMfYEFeIr9rBkcIlFzjk1FhxCgIz1f28ivhToICk5f NkVA== X-Gm-Message-State: ANhLgQ1zL3CMu1wsq7MHA27X+rwsvoDqnDzFrPQuOBsFXnYPBSgpldqQ kuRR3d2r7l5Bu2OeWLrv+Kv/gQ== X-Received: by 2002:adf:ed42:: with SMTP id u2mr3398768wro.345.1583316120186; Wed, 04 Mar 2020 02:02:00 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm4055067wme.36.2020.03.04.02.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:01:55 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2C3141FF90; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/9] tests/vm: increased max timeout for vm boot. Date: Wed, 4 Mar 2020 10:01:48 +0000 Message-Id: <20200304100154.14822-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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::435 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 , Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Peter Puhov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= 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> Message-Id: <20200303150622.20133-4-alex.bennee@linaro.org> -- 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