From patchwork Mon Mar 2 18:19:01 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: 184115 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2708392ile; Mon, 2 Mar 2020 10:27:34 -0800 (PST) X-Google-Smtp-Source: ADFU+vvFrAUQpevrBGWXHeCwlzxHf59ldmplQ5noFg3teBNLsI9wFzEL8g2sDIdFXsMc6HdQ9Mo4 X-Received: by 2002:ac8:5208:: with SMTP id r8mr969884qtn.131.1583173654019; Mon, 02 Mar 2020 10:27:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173654; cv=none; d=google.com; s=arc-20160816; b=aKQgHg55kHSxBd1Xwps7JnCnzw/hNd7m5RhIK5d5oBc+1HEkBzKZgK6r1fKNe+z9yo 6ghTdy9inX1hZwqRWR3hyQF7l7EmDVTx87ITEskdrMLrPfq7TxPgJhrIaboyGFmTWW+l rAfxWl68Pu3D0DQJ+/7ViHiVDOE/XLuZ+sOCUzXZmJlR54eEVMnfC8AITgpe5P5Xfb8f 8685ximXXcnkbojzr59dxm2RZSZiEerKYpQjaWALDBUetQWDehEL6Jap4ZZbcn246NdL jbho4lSaDptOtJR2YbKChlZinWjkOkeuuFk8fQ7Oxog/CWbYj7M5FtN40BTnlPJI/Uo0 5eEQ== 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=Z7tiVgE0/FNumYwGDaf9+n6Hr38jcg9tS9OSWzqMpF0=; b=vhuLycpqpjk3VvFY7MFiwrFUjqJWzDKnBQgC0lIHCenFcBTVr9nJD+Js3zg35YWLad JkhmtKquLeSARGtlRPf46SaxI5VZlV9cc/kp6OwRxEOdoux7qL8ZyGIYxNgQAurlrCZc HDW2IoO+QmR64lBDfdfFvrfw8b2PtnXSw69S9NGAUQl31qj0aahydPc3+pdG6zNZCqu4 NRmLrga0eWe403VWLSkDvH3RG7NG5zhTjU0WJpULni2QeMniI5GfwKtZojGnTSGE8ANq AufuU6sRadGm6twDJn9Ntp0JZ6psePFCYRzOuma8dGDWWlrcGtZMhzlAVayjH1Uxrcq6 LHiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eVNXvTqx; 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 x10si5964593qkx.36.2020.03.02.10.27.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:27:34 -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=eVNXvTqx; 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]:37078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pmv-0007OC-JE for patch@linaro.org; Mon, 02 Mar 2020 13:27:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43586) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002We-9Z 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-0001DH-5f for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42123) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfB-00019h-Ut for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: by mail-wr1-x441.google.com with SMTP id z11so946908wro.9 for ; Mon, 02 Mar 2020 10:19:18 -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=Z7tiVgE0/FNumYwGDaf9+n6Hr38jcg9tS9OSWzqMpF0=; b=eVNXvTqxkgzp4va17Wq3iQBjA4MXaCuf/mi2kTxN7+BnJfrGJ/LEiv4gChYnjs+J8q xN0IZs8pugYKpJk8MnGpicMVLY9uVJ1vkzzplxOFCp16JQ4Ii4stWBZgMaRh19mMA6eZ YKPRFiVeAd4QGz+rHbRSyqUCm5UPW8jHnV9DEbtFpl/0LM/20t7uWbtECXgKxpDaoql4 SCvPXTRDW/k+2CZoj0qT00zaHUj547W+N9oK72FxY5yyrRHeMvZZfPnqIM8BcS2BEAZu AxRTw2GCouxpDYNBN5le86ILVCzTFdfEEmVsal3RZIUM7gfIIGslHYjceP6ORWqbc/c1 b64Q== 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=Z7tiVgE0/FNumYwGDaf9+n6Hr38jcg9tS9OSWzqMpF0=; b=FIAKUCTRVklzomC47TZG/YXTVZtxFukHgTg73gStQf8u8gBlhIv9uBmP2b6k3y9ce7 dDz2e6gL0nVfMPkOLe+Ud+6Onxy1WH+SyO4TaANnMdvtkBdJtpWdnuTE61fKRnbEKwdV q7QY2TteHSR0G17yF4BbG6eHK9FmbYnVrCDi3PqTyX+NITXIZZ/VEC3r9kvGShKD0oBA PN6folNpbI201qJPIErMbxX31SC+fP0PKHCcXxZjK6QtecGWF4jE/WQ864DLoPiYA8Xj DozqL8pW178GZkXbQ3RzafiJEIkqP5laOzuxDGb0LiET4JFyPQ2ZvdooGX3BteIzY2PY QmZw== X-Gm-Message-State: ANhLgQ2eqHyGLsYz/swIAD0CMifOyMDKa6sJgz3E7QU8sEsEofkhshtZ eXNpKoHw/f05dpECX0jZGVeXtQ== X-Received: by 2002:a5d:69cb:: with SMTP id s11mr758325wrw.47.1583173152151; Mon, 02 Mar 2020 10:19:12 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm318344wme.36.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 D4F031FF91; 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 04/10] tests/vm: give wait_ssh() option to wait for root Date: Mon, 2 Mar 2020 18:19:01 +0000 Message-Id: <20200302181907.32110-5-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::441 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 Allow wait_ssh to wait for root user to be ready. This solves the issue where we perform a wait_ssh() successfully, but the root user is not yet ready to be logged in. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Reviewed-by: Peter Puhov Signed-off-by: Alex Bennée Message-Id: <20200219163537.22098-5-robert.foley@linaro.org> --- tests/vm/basevm.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 5ca445e29af..7f268922685 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -312,7 +312,7 @@ class BaseVM(object): def print_step(self, text): sys.stderr.write("### %s ...\n" % text) - def wait_ssh(self, seconds=300): + def wait_ssh(self, wait_root=False, seconds=300): # Allow more time for VM to boot under TCG. if not kvm_available(self.arch): seconds *= self.tcg_ssh_timeout_multiplier @@ -320,7 +320,10 @@ class BaseVM(object): endtime = starttime + datetime.timedelta(seconds=seconds) guest_up = False while datetime.datetime.now() < endtime: - if self.ssh("exit 0") == 0: + if wait_root and self.ssh_root("exit 0") == 0: + guest_up = True + break + elif self.ssh("exit 0") == 0: guest_up = True break seconds = (endtime - datetime.datetime.now()).total_seconds()