From patchwork Wed Mar 4 10:01:47 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: 184162 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4707297ile; Wed, 4 Mar 2020 02:04:45 -0800 (PST) X-Google-Smtp-Source: ADFU+vvo2tjDlXSCL8tqfoK/qPdmPQYbW+Gpml84brWiAjwc0R7o8ZzlFl70G87kLMRdeV68CRWf X-Received: by 2002:ac8:1c0d:: with SMTP id a13mr1617566qtk.253.1583316284966; Wed, 04 Mar 2020 02:04:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316284; cv=none; d=google.com; s=arc-20160816; b=ht6TY3Bm+f4VRPgSp1GmiCIYiCyOoYYGQExQ4dF+12KYSyJB5NuGhxidQCzdlHvaRx dVq9a088tVs4HjZxwbI7axcW2pFPaWdcjKfLjfhZP1GOoFp17shVmOtkhmQsbtQB3buY XyAeUcifvTy3pLEMd5vSO9ncgrxP/DNNN0fYfmUAxg++VaCypRckVxSSrIczvkEt2fR+ OJA/h78MF3QRSdZP2bZ8Op+oEcJwL4OIsj5DMCWEhXZgJo3IsLv70/pY3bJ3Uu2JX4dE +k43GwD9dqGelZfOlf/VroOR2V0JrBAMd5IkNCtTxPKRGW17FcQ8MjkJH7pTb6MAoi2l y9eg== 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=iAaxlo38yaH/aDkZ3KTpVwewFX+cb3wfaOvBPGIDGsc=; b=KZNXC+3zJ9MD8Oq+EXMMOM5dNg7cl3g867g2L2HFcqRwID2c/eDVo9QM+WgzQCnyMY qhcMQd4/yInBpcWT9P6nr81U7c4xb7yrUcgOc5RqAXWyH4a+y6cST8fL1YrwZRyf0Bdr nt/fH8OOJ0srJKRrppD8yDqAG8PRuOC9Zmz8H3xEMmTxu8XRglhKCcjn9GHBrckEVyNv 30J3x/i99O8yANUhBukOmAV3RgQhNpyDSh0km4eYzBemAm9PJSdAacd5dB4BUHquWd+h /pL+U+PSgwc5GMEjg7qACBUlIBuztyr+HFduNPshmd7nhSMYlUEn2xo0jPJAQQ8C8SZG aV9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KrCKUIKj; 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 m40si675911qvg.89.2020.03.04.02.04.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:04:44 -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=KrCKUIKj; 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]:60000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9QtQ-0002q2-G4 for patch@linaro.org; Wed, 04 Mar 2020 05:04:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41610) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqn-0006zd-KL 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 1j9Qqm-0000P3-CP for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:01 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:34279) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqm-0000KW-6C for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:00 -0500 Received: by mail-wr1-x432.google.com with SMTP id z15so1621682wrl.1 for ; Wed, 04 Mar 2020 02:02:00 -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=iAaxlo38yaH/aDkZ3KTpVwewFX+cb3wfaOvBPGIDGsc=; b=KrCKUIKjTyQ7CyIy9hSrRr6uLcDHt/qWqVpvVKYFH3D1yFi/peDHjbKVeXcL46TLpA lBK51FG0o1jdgrLBiZE9M27Wl14ngT1Fi5n5Ra6kc/vQt1RMWaJg91TAlgTnk0QBNXXF v7rFJQbqRZ5jwfaLwSsALnmfNacKoSVJdC5r+l/nwZvgsiqSQ23w9zO1DkHS07+U+PAb gY47fLHlCCBgFMakEobNSqkYjSYcDD50CILNb8+0WTks44vJfa3eeBLGMxwqgjuZzgZT ZbTTDVoN27sR4pOspNxPkmkzAL39rKtdQV89Vp0BGeFmBv0gya1JTMWy8eIhLIQXxMXh yt9Q== 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=iAaxlo38yaH/aDkZ3KTpVwewFX+cb3wfaOvBPGIDGsc=; b=Z7SaqKMd6oiS1JvSE4Mc9K5JB298QXsM1r1v0ewXPVJ+/EODldZdmc4Y00cwd1q8pn bjGGZFGclB5ckWCOMOjIpvKqxyRcm6jUjivOPqOlpJUd3lmLtDYT+N05ZUZRa06AnmhW ItqinVw/0m7f9KNass6TSlqlPzx2Q4ID/Nojyh9Hdl9bF42Xw0At7l8vHkV2+ohEfq6Q AO7URLu2t2yLiegpBHkiH6z09pok1xuKchv54BTMoXr30v+TXT7rVBhr5XqasqhtgcpW MYnsLQOG6arp12ml0WH2LsUqK469xS8+6Oshl9ngbvhJ9tQL71K2YEMzNm6PFnWdtTFi 2o4g== X-Gm-Message-State: ANhLgQ05OzOLC5tjdP3IEC8YcJwsXRioST9lkcdqDf1ZkMLm/XKokTwe ElqVebsgY9WmU3mhM/Iwppg0pA== X-Received: by 2002:adf:f7c1:: with SMTP id a1mr3289626wrq.299.1583316119092; Wed, 04 Mar 2020 02:01:59 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w1sm3254552wmc.11.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 17F631FF8F; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/9] tests/vm: Debug mode shows ssh output. Date: Wed, 4 Mar 2020 10:01:47 +0000 Message-Id: <20200304100154.14822-3-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::432 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 changes to tests/vm/basevm.py so that during debug mode we show ssh output. Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200219163537.22098-3-robert.foley@linaro.org> Message-Id: <20200303150622.20133-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 4dee6647e6e..c99725b8c0d 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -120,11 +120,16 @@ class BaseVM(object): return fname def _ssh_do(self, user, cmd, check): - ssh_cmd = ["ssh", "-q", "-t", + ssh_cmd = ["ssh", + "-t", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=" + os.devnull, "-o", "ConnectTimeout=1", "-p", self.ssh_port, "-i", self._ssh_key_file] + # If not in debug mode, set ssh to quiet mode to + # avoid printing the results of commands. + if not self.debug: + ssh_cmd.append("-q") for var in self.envvars: ssh_cmd += ['-o', "SendEnv=%s" % var ] assert not isinstance(cmd, str)