From nobody Wed Nov 19 13:53:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615953271; cv=none; d=zohomail.com; s=zohoarc; b=L7H0jV/xIJyJX93Att1LksG655HKVBTJHNdAn6obDkD73P7AtSWluICfk/RtBWi3JpbJYQw3a5MWyTuShkickCmZEOXvugufDg6euN3CYInNPIgaO2LRudXqvKsk+5kW/R5sX9Ab2mafmacKz11SyphRoCRCCWWZ064MpBZOK2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615953271; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8GKG3PiDrEQBJLCs+5Ktm4SczTf0D+iveHDe3qTuE3A=; b=nKzO9qWzRea01p1Ct0Ua99qFUJTr/p29oBpUrQ+evc8vPK5oyhye6N/vAGA1AzUV5ZjxpWWl5T80Dp0zJqJBUruIM8jQXkU1EhbMEq3ATC3akn1vvYi5c9R2aeMPteSuObbzHcSyBCnOTB5gM4okJlgs6NxzgNHQmGFkASwPokg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615953271750354.27902742158744; Tue, 16 Mar 2021 20:54:31 -0700 (PDT) Received: from localhost ([::1]:45144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMNGQ-0005U1-Oc for importer@patchew.org; Tue, 16 Mar 2021 23:54:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMNFG-0003pS-N8 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:53:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57351) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMNFF-0003C6-3D for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:53:18 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-N-jETTgeO3aZjPj77ONdQA-1; Tue, 16 Mar 2021 23:53:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B2DB107ACCD; Wed, 17 Mar 2021 03:53:12 +0000 (UTC) Received: from localhost.net (ovpn-113-107.rdu2.redhat.com [10.10.113.107]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 637475D9C0; Wed, 17 Mar 2021 03:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615953196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8GKG3PiDrEQBJLCs+5Ktm4SczTf0D+iveHDe3qTuE3A=; b=b88BBGutbFFnQcA35dvX+iSdKXJMW5lbb8k3o41PC6Q7KvTNn3UkMbEq/KJjs6Ua55ZvN9 76cY8BdHUgR3vf1PsP1vTapRcwUeZqwJEBRVic14sYmSiKyhKmaWEnrx+fKSE9fj32KCNy CUkaVWLWpnIRFfdwG958gQPTbh+T6UM= X-MC-Unique: N-jETTgeO3aZjPj77ONdQA-1 From: Cleber Rosa To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 5/5] tests/acceptance: linux-related tests fix Date: Tue, 16 Mar 2021 23:52:42 -0400 Message-Id: <20210317035242.24418-6-crosa@redhat.com> In-Reply-To: <20210317035242.24418-1-crosa@redhat.com> References: <20210317035242.24418-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=crosa@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=crosa@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Pavel Dovgalyuk , Eduardo Habkost , John Snow , Wainer dos Santos Moschetta , Willian Rampazzo , Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Beraldo Leal Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk This patch allows cloudinit images download when ssh key is not specified. Signed-off-by: Pavel Dovgalyuk Message-Id: <161373266228.1608713.7614311331725780044.stgit@pasha-ThinkPad-= X280> Reviewed-by: Willian Rampazzo Signed-off-by: Cleber Rosa --- tests/acceptance/avocado_qemu/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index ac8041821fa..83b1741ec85 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -317,8 +317,10 @@ def prepare_cloudinit(self, ssh_pubkey=3DNone): try: cloudinit_iso =3D os.path.join(self.workdir, 'cloudinit.iso') self.phone_home_port =3D network.find_free_port() - with open(ssh_pubkey) as pubkey: - pubkey_content =3D pubkey.read() + pubkey_content =3D None + if ssh_pubkey: + with open(ssh_pubkey) as pubkey: + pubkey_content =3D pubkey.read() cloudinit.iso(cloudinit_iso, self.name, username=3D'root', password=3D'password', --=20 2.30.2