From patchwork Wed Mar 25 15:15:37 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: 184814 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp737983ile; Wed, 25 Mar 2020 08:24:00 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsu51PpGjVzpYRvNLA4y4MOKcT8NdvmNPY3I7y8kJLMSt9v60we/HVO2EH6iahq/zDY4Xei X-Received: by 2002:a0c:fe01:: with SMTP id x1mr3591443qvr.243.1585149840096; Wed, 25 Mar 2020 08:24:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149840; cv=none; d=google.com; s=arc-20160816; b=tOgFrgv3uL/vT1q9hgJ72YWqnYhsPgtALTJlXlirpaCFCgDwnwebOMecFXpGM5cgIM pn9CwTwNfWdZCH4l+z9SQxL0GnEAqKxGbXfkTuo9YYDgSexRX4qjl/edMMkxyJQS1MtD ZSJvrspFoq0Bmsbs152FkjY6FFYqvL1hzNH+vf1GJYJq6v9xXskkExRShYa+RwLUUN6I S3sswd03tBpNAm+af/7pPCHmke6ayqU2Hqht+IXtbA+VwDRlg1qsPKqq9tzpADsiq4t2 uRBmfHwOiC3q5kQ5V42CHr2GR21mMxlui6O5uzkcw0V48UR0dltwOimFRjAn3OrxShCM cQSg== 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=l7mM2oj13ibfp0JE0ahAZG76SnCWxFa0MFbX0Uuu7f8=; b=em3V74A4E5qx2f7/Gknk5pYv4+Im1MfwSJDQj6hcNG/4ebKdFfZStJbaJFUPve59A4 MzQ8FC3L2uwRj4H2nD07w5JNyjwyUAMaQYiyxEW/7g8hG1Byw+WDZEBgtFD/ogmTaD4H XMZq1diaP1KZ+Zfpa2NmPzudupla1x1tMS24xcUBI/NOwXBaPsYp2K4TfbTc4mGsfy9m NAwmiKjcW9gn5+ognh9Iq2OxzsrJDAOQDGb+H5oO6gTAR6SRObo/Sn/RxoQ1xRkpo2tq rF4Cp29HMnl2g5eEvxowcYWVntzjpKpj73FlKA23yJ/IBj1hDuUAeEClpCjgjMm7MKJ4 R5NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hfYzGqV3; 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 o13si6977855qkg.48.2020.03.25.08.24.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:24:00 -0700 (PDT) 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=hfYzGqV3; 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]:38178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7st-0008W5-LL for patch@linaro.org; Wed, 25 Mar 2020 11:23:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41531) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7l7-0003i0-V2 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7l6-00082c-TW for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:57 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:42808) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7l6-00081a-N8 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:56 -0400 Received: by mail-wr1-x432.google.com with SMTP id h15so3568257wrx.9 for ; Wed, 25 Mar 2020 08:15:55 -0700 (PDT) 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=l7mM2oj13ibfp0JE0ahAZG76SnCWxFa0MFbX0Uuu7f8=; b=hfYzGqV3p86O/5DPGWrz+TOrYdhbvvUcMQv4fL0QBq4nhsyh9CcbVGNJF3wYM2q+T2 OM1iUcGDvpRvBx7FWItk8MMBVRg5RCtzDCo8qRppXNStlYEzdF4J0XLvH1uc1JoYUVa+ CKYGBVci9Rd69K79Em/OEr/ocjqszJFF0WlIpAf0zAR7Ll6uxhPxjECb+mI5KF/ADO4m O+YoXfHgCgv4QXZFnOnoPK31qtHkS1ZCW9veQdGwKw4yopNFO77bF4AQE75kTwxVO76h xs+Md5qR+cetPAaErGT4V/Wpt0pnttsg5RI/LMNtGCvwMfhQdD0YBFAxFv27rlexZCZl kxYA== 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=l7mM2oj13ibfp0JE0ahAZG76SnCWxFa0MFbX0Uuu7f8=; b=JC1biSylvLuu40wuOccQlGIDulKYD53F3VzMquLzRKfxg2mlxJUjFXER+okK4HmeUn 1RFeBm2qIq/eTcAwjEk0o1SicbWBzKgyFZufNJoPt1OFAgGfq/9wPAIyTqgQzZDq7GzE WgKM376u0lygiEPJkdpwb3SBBIRHwxdvGSDEDsGmPbzsTZy6HyQgXc4YSfVyYro8k/RR CHsA1iqrWCLfliOMBucPyl0zHAAGBJ8kzVBF+2Edtv1MHbht6vYfjSyJ3Y6HQQdskQIP aaOb2RCzkzULTy+Vt2wCXyhG7rehtFfNQ1GjH+63C7GDPo21Sqzb24zmf2wvlYj676s0 +D/A== X-Gm-Message-State: ANhLgQ3XQtVxmRqJBt9SYjGzHCb/lAdjIpTSd873yWFWQoxgQ2pXOxXY Pp9pv14xym3Gp6q8sohwnChfbA== X-Received: by 2002:a5d:4489:: with SMTP id j9mr3859544wrq.161.1585149354722; Wed, 25 Mar 2020 08:15:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u131sm10078054wmg.41.2020.03.25.08.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B6A791FF91; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 05/11] tests/vm: fix basevm config Date: Wed, 25 Mar 2020 15:15:37 +0000 Message-Id: <20200325151543.32478-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-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 , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When the patch was merged it was part of a longer series which had already merged the config changes. Semu-revert the config related changes for now so things will build. Fixes: b081986c85fd2 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200323161514.23952-6-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index cffe7c4600e..756ccf7acae 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -358,23 +358,23 @@ class BaseVM(object): "local-hostname: {}-guest\n".format(name)]) mdata.close() udata = open(os.path.join(cidir, "user-data"), "w") - print("guest user:pw {}:{}".format(self._config['guest_user'], - self._config['guest_pass'])) + print("guest user:pw {}:{}".format(self.GUEST_USER, + self.GUEST_PASS)) udata.writelines(["#cloud-config\n", "chpasswd:\n", " list: |\n", - " root:%s\n" % self._config['root_pass'], - " %s:%s\n" % (self._config['guest_user'], - self._config['guest_pass']), + " root:%s\n" % self.ROOT_PASS, + " %s:%s\n" % (self.GUEST_USER, + self.GUEST_PASS), " expire: False\n", "users:\n", - " - name: %s\n" % self._config['guest_user'], + " - name: %s\n" % self.GUEST_USER, " sudo: ALL=(ALL) NOPASSWD:ALL\n", " ssh-authorized-keys:\n", - " - %s\n" % self._config['ssh_pub_key'], + " - %s\n" % SSH_PUB_KEY, " - name: root\n", " ssh-authorized-keys:\n", - " - %s\n" % self._config['ssh_pub_key'], + " - %s\n" % SSH_PUB_KEY, "locale: en_US.UTF-8\n"]) proxy = os.environ.get("http_proxy") if not proxy is None: