From nobody Mon Feb 9 08:12:04 2026 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=1618203244; cv=none; d=zohomail.com; s=zohoarc; b=MIFXtfXsG1JiXEnCeh/glvp9dyj4/wXRji0/3+0njR17cyk4htsp0g0ogQcbREFot/CxYm/0n8pRBIUPrDexD9Y0MJZs4ffiCfh7dMkdj2/rKwowRmGT55yXcvwdGj8rKfOQMOoR4Tr7/vJJwc37//6PlmNpCHisqxjsf6vhKRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618203244; 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=s4V7GUsyPtXNmKYWoJ5J0YQlTlDC0pTVemmbMzGOd9A=; b=lyH/jmcWdRObFfgaYi5XrQYsOiQdl+HQVy7mu+qNa9Gv2O47aQXjht4xP3SipnGWEZdBnIj9sFnWQXOVdMUvAj05by97CCP/x+b2iSc7e7vtwoIzPXL/FZ6LCVYpfH2JC7yumo4qNSHpg8/im9YSVP9ylRWamLuiK1CetNb260s= 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 1618203244719835.712658044121; Sun, 11 Apr 2021 21:54:04 -0700 (PDT) Received: from localhost ([::1]:36154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVoaJ-0002L5-Bd for importer@patchew.org; Mon, 12 Apr 2021 00:54:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVoUO-0002QD-PQ for qemu-devel@nongnu.org; Mon, 12 Apr 2021 00:47:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVoUM-0003kH-Sb for qemu-devel@nongnu.org; Mon, 12 Apr 2021 00:47:56 -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-126-FcE5O1ixPbyCLo2f8L_6pw-1; Mon, 12 Apr 2021 00:47:52 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6ACB26D241; Mon, 12 Apr 2021 04:47:51 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-108.rdu2.redhat.com [10.10.113.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DA6DA1045D12; Mon, 12 Apr 2021 04:47:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618202874; 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=s4V7GUsyPtXNmKYWoJ5J0YQlTlDC0pTVemmbMzGOd9A=; b=OG+1ZBgr1RgzwUUZLyMdHb19UCQJR4gs325mjpJngmeiSgQ+ysBeBhK0JtG3586Gg5HR0g KZw3D0rOLW0d9fkgneSk2c9q+Y2M5/AanmYn50uoH3zMjcadF7llL+f26CSIv12nHLMb1E cCWCTFfi8SwzfGkBWXjlNNzg/KxNPac= X-MC-Unique: FcE5O1ixPbyCLo2f8L_6pw-1 From: Cleber Rosa To: qemu-devel@nongnu.org Subject: [PATCH v3 07/11] Acceptance Tests: set up SSH connection by default after boot for LinuxTest Date: Mon, 12 Apr 2021 00:46:40 -0400 Message-Id: <20210412044644.55083-8-crosa@redhat.com> In-Reply-To: <20210412044644.55083-1-crosa@redhat.com> References: <20210412044644.55083-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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-Type: text/plain; charset="utf-8" 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=170.10.133.124; envelope-from=crosa@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Thomas Huth , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , John Snow , Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , Beraldo Leal Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The LinuxTest specifically targets users that need to interact with Linux guests. So, it makes sense to give a connection by default, and avoid requiring it as boiler-plate code. Signed-off-by: Cleber Rosa Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Willian Rampazzo Reviewed-by: Eric Auger --- tests/acceptance/avocado_qemu/__init__.py | 5 ++++- tests/acceptance/boot_linux.py | 18 +++++++++--------- tests/acceptance/virtiofs_submounts.py | 1 - 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 25f871f5bc6..1062a851b97 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -391,7 +391,7 @@ def set_up_cloudinit(self, ssh_pubkey=3DNone): cloudinit_iso =3D self.prepare_cloudinit(ssh_pubkey) self.vm.add_args('-drive', 'file=3D%s,format=3Draw' % cloudinit_is= o) =20 - def launch_and_wait(self): + def launch_and_wait(self, set_up_ssh_connection=3DTrue): self.vm.set_console() self.vm.launch() console_drainer =3D datadrainer.LineLogger(self.vm.console_socket.= fileno(), @@ -399,3 +399,6 @@ def launch_and_wait(self): console_drainer.start() self.log.info('VM launched, waiting for boot confirmation from gue= st') cloudinit.wait_for_phone_home(('0.0.0.0', self.phone_home_port), s= elf.name) + if set_up_ssh_connection: + self.log.info('Setting up the SSH connection') + self.ssh_connect(self.username, self.ssh_key) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 0d178038a09..314370fd1f5 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -29,7 +29,7 @@ def test_pc_i440fx_tcg(self): """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") - self.launch_and_wait() + self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 def test_pc_i440fx_kvm(self): """ @@ -38,7 +38,7 @@ def test_pc_i440fx_kvm(self): """ self.require_accelerator("kvm") self.vm.add_args("-accel", "kvm") - self.launch_and_wait() + self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 def test_pc_q35_tcg(self): """ @@ -47,7 +47,7 @@ def test_pc_q35_tcg(self): """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") - self.launch_and_wait() + self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 def test_pc_q35_kvm(self): """ @@ -56,7 +56,7 @@ def test_pc_q35_kvm(self): """ self.require_accelerator("kvm") self.vm.add_args("-accel", "kvm") - self.launch_and_wait() + self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 =20 class BootLinuxAarch64(LinuxTest): @@ -85,7 +85,7 @@ def test_virt_tcg(self): self.vm.add_args("-cpu", "max") self.vm.add_args("-machine", "virt,gic-version=3D2") self.add_common_args() - self.launch_and_wait() + self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 def test_virt_kvm_gicv2(self): """ @@ -98,7 +98,7 @@ def test_virt_kvm_gicv2(self): self.vm.add_args("-cpu", "host") self.vm.add_args("-machine", "virt,gic-version=3D2") self.add_common_args() - self.launch_and_wait() + self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 def test_virt_kvm_gicv3(self): """ @@ -111,7 +111,7 @@ def test_virt_kvm_gicv3(self): self.vm.add_args("-cpu", "host") self.vm.add_args("-machine", "virt,gic-version=3D3") self.add_common_args() - self.launch_and_wait() + self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 =20 class BootLinuxPPC64(LinuxTest): @@ -128,7 +128,7 @@ def test_pseries_tcg(self): """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") - self.launch_and_wait() + self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 =20 class BootLinuxS390X(LinuxTest): @@ -146,4 +146,4 @@ def test_s390_ccw_virtio_tcg(self): """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") - self.launch_and_wait() + self.launch_and_wait(set_up_ssh_connection=3DFalse) diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virt= iofs_submounts.py index e10a935ac4e..e019d3b896b 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -136,7 +136,6 @@ def set_up_virtiofs(self): =20 def launch_vm(self): self.launch_and_wait() - self.ssh_connect('root', self.ssh_key) =20 def set_up_nested_mounts(self): scratch_dir =3D os.path.join(self.shared_dir, 'scratch') --=20 2.30.2