From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791448; cv=none; d=zohomail.com; s=zohoarc; b=Im9dFuScYiQz46AHT/2AMU7CmxOu3I2y68wWESjpRVDFt2MRa6X2CX1I1Xp/nD/radq/PcGmYy45DCGUDsn3i/Voydn3g3rHyRM5fPPyKa+NrBiWGBCVYjAHQMuT1j8kQAvBep25m0uDxoBw4gOvB18JpvopUQynTlgaQbcBnak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791448; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=W/983sKCXCSNy2SywL9DvVo0od8KR97/FwleNIFTEaM=; b=Amj4//8DtS4JNK9oz8i5TLsM4GNwEmkjV+I6rj96N8jgGJtq0cb52CnKIGKtnJhnNtD19Ely+qlWQrEz5lulxcesnW4y8Mp3PrrRm0MVAbOIolKUe7uS5XQ5KrC/hX+VLY98+D2ng/SCV6S94M5/RafDaEcYpVaaehtOiyzLrzo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791448809425.01800098415276; Mon, 8 Feb 2021 05:37:28 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-435-ikl5rSh9PEmsWTB1FhbxcA-1; Mon, 08 Feb 2021 08:37:23 -0500 Received: by mail-wr1-f72.google.com with SMTP id x7so12980168wrp.9 for ; Mon, 08 Feb 2021 05:37:23 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id g1sm28113599wrq.30.2021.02.08.05.37.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:37:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791446; 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=W/983sKCXCSNy2SywL9DvVo0od8KR97/FwleNIFTEaM=; b=FqYIu5h1a9yihQx7emVL/vg8mXjJwD2ifLXBx3auC9ycxljzKGVtaekpXx7f6m3ZUVt5i8 M6FI/gSOicvuLrddYcja7+LyUF0V4O84WrF4YnucHj+j9Xeq25uUrC4CoGr72SJ/KiRqnm B+Y4cD+N1UD6ZJotTDjY1pPai2W2p+k= X-MC-Unique: ikl5rSh9PEmsWTB1FhbxcA-1 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=W/983sKCXCSNy2SywL9DvVo0od8KR97/FwleNIFTEaM=; b=k3SbvQYpZaDxoNudOgZ+jXjrgxjE6DOeWQZ392nH9H0THAQIx0IMkMc+8un6yRBHMg jEi9lw/yBQMhG2AOUaiNu0GxDTK+1F9C+AvZpb0LR4bO/hQ1sIBq1iJ3ZjfzpTSCKbx5 ZneIhUuRXIbmY6/3/DmLIWMWdVDDEdo+mKz3+oj91kWIMNj9ZHgKcJU2+O4qMRwBtCmN SQryZ+yFiHbcU90FuGrcW3enB2BnBR2PfbKqc8QsipiTKUjENQHhGtOxI0hxvQfY2oO3 ZsVA+mFr23MIu9LjQhyhgMAgQKM8ujkodaHKz0NG7ak+qELFtJCY7rnBCkib/Oz2kJJj 1IJg== X-Gm-Message-State: AOAM532C53/786C3YN/4Gma9yS4C/uwHfP7WVv0XFmF3PUUHdHAIlLTb 8bYczLxPQcTUTs119OpcKL4QSMSwiaIeIQi9WuCIX53Hf5e+/OFfXMyw+LNVfBTu/WHmM19YKgG Tr0VP3Ems9vr7/Q== X-Received: by 2002:a05:600c:4857:: with SMTP id j23mr3415369wmo.66.1612791440637; Mon, 08 Feb 2021 05:37:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYZ9l0l9dfqa49K8Xmck4MY+gwz7LZQDFFjHnu+9T4zSsfulzysDKTayX86AAgaF/DZMwZog== X-Received: by 2002:a05:600c:4857:: with SMTP id j23mr3415263wmo.66.1612791438521; Mon, 08 Feb 2021 05:37:18 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 01/18] tests/acceptance: Extract tesseract_available() helper in new namespace Date: Mon, 8 Feb 2021 14:36:54 +0100 Message-Id: <20210208133711.2596075-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 We are going to reuse tesseract_available(). Extract it to a new 'tesseract_utils' namespace. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20201021105035.2477784-4-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/machine_m68k_nextcube.py | 25 +++----------------- tests/acceptance/tesseract_utils.py | 28 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 tests/acceptance/tesseract_utils.py diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/m= achine_m68k_nextcube.py index 2baba5fdc26..3c7400c43e4 100644 --- a/tests/acceptance/machine_m68k_nextcube.py +++ b/tests/acceptance/machine_m68k_nextcube.py @@ -1,19 +1,19 @@ # Functional test that boots a VM and run OCR on the framebuffer # -# Copyright (c) Philippe Mathieu-Daud=C3=A9 +# Copyright (c) 2019 Philippe Mathieu-Daud=C3=A9 # # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 import os -import re import time import logging =20 from avocado_qemu import Test from avocado import skipUnless from avocado.utils import process -from avocado.utils.path import find_command, CmdNotFoundError + +from tesseract_utils import tesseract_available =20 PIL_AVAILABLE =3D True try: @@ -22,25 +22,6 @@ PIL_AVAILABLE =3D False =20 =20 -def tesseract_available(expected_version): - try: - find_command('tesseract') - except CmdNotFoundError: - return False - res =3D process.run('tesseract --version') - try: - version =3D res.stdout_text.split()[1] - except IndexError: - version =3D res.stderr_text.split()[1] - return int(version.split('.')[0]) =3D=3D expected_version - - match =3D re.match(r'tesseract\s(\d)', res) - if match is None: - return False - # now this is guaranteed to be a digit - return int(match.groups()[0]) =3D=3D expected_version - - class NextCubeMachine(Test): """ :avocado: tags=3Darch:m68k diff --git a/tests/acceptance/tesseract_utils.py b/tests/acceptance/tessera= ct_utils.py new file mode 100644 index 00000000000..acd6e8c2faa --- /dev/null +++ b/tests/acceptance/tesseract_utils.py @@ -0,0 +1,28 @@ +# ... +# +# Copyright (c) 2019 Philippe Mathieu-Daud=C3=A9 +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +import re + +from avocado.utils.path import find_command, CmdNotFoundError + +def tesseract_available(expected_version): + try: + find_command('tesseract') + except CmdNotFoundError: + return False + res =3D process.run('tesseract --version') + try: + version =3D res.stdout_text.split()[1] + except IndexError: + version =3D res.stderr_text.split()[1] + return int(version.split('.')[0]) =3D=3D expected_version + + match =3D re.match(r'tesseract\s(\d)', res) + if match is None: + return False + # now this is guaranteed to be a digit + return int(match.groups()[0]) =3D=3D expected_version --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791448; cv=none; d=zohomail.com; s=zohoarc; b=hCDqNbyejWfSlKUCtVWKTUmRXuNHqY8s3k9KhbEISZAw2zDUae5pvEwLI5vS29z/kfh0Ec7VvXVeWiz4R0bqF9SdPQhQWR8xeqYqv/XWKkmz4KBdUHB88+r7vYleqDoF0xDiFS+X+jZXvt/s2GHm6RlLSUFKekXzE8EDF4C/Vvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791448; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=gKSefXopzRxtb9v5Y5RO90UGTU966dCGUeKM2oJe9pM=; b=UVuF6B5LOYJyOuHKCviDZzC9KaqE6pgcKOVBAkYBw1KsZOC8BAZJHfjhdKgHwbeIJWKmQrhSBQJ4uBR5J5IZxNIc+uEk0rNPPLfMfyqGulA/jQP/+uaJk/GXEITEhmLWdqrsK+y8edNvpWnE+fmWt7XwBYdUYJWh8bQdCO6clEU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791448983113.22184121384066; Mon, 8 Feb 2021 05:37:28 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-Njk4szohO26IAZkrDxE8eg-1; Mon, 08 Feb 2021 08:37:26 -0500 Received: by mail-wm1-f72.google.com with SMTP id p8so1194454wmq.7 for ; Mon, 08 Feb 2021 05:37:26 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id s6sm21016927wmh.2.2021.02.08.05.37.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:37:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791448; 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=gKSefXopzRxtb9v5Y5RO90UGTU966dCGUeKM2oJe9pM=; b=CkwvFHEegGmrwqzGkFoCzCRgW/vMJ6sLqZ8Aw5+J/G2Gk+fJQwI3AX6U2C58nUT3NGW1q8 BWgf+WpwX3AGt0Tvj5JEmsYsePqCDyfjEVnd004dInIWJO0Fwk9ggeWLgJQWXcIm5Amfhu aJPC3utVpgvZSf2Ed8+ef5vjFZhj2nY= X-MC-Unique: Njk4szohO26IAZkrDxE8eg-1 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=gKSefXopzRxtb9v5Y5RO90UGTU966dCGUeKM2oJe9pM=; b=UBni6VsLjB1Hig7PTQtPY9SNgVXXJgg7jSlt7yg6DFvU1GPIuRKcdWyMycqKGo7Ydj MeE/qD8gEaZZMfIggoEqevAjU5IGFRbkhCH0Lb2CrZpMD+jnJpARbbEXKOoWNqdLKXFs 4MtEsJ6I7tT5kpYXO6957DN5ndqhuCvr10BSIcvBVj9yDgmKgJPKNHN2SNY4jORiuKaj l5LZt+SjfDycnNeEl/4PE9uP84AImEFFsWb4pSR+CWXSZzxa0Jrlqx8h5g2lRKSh9IM+ BJ3gvIaZAZKJzWY/5SEviZ15ODtJsCcNWZGGM1FNsbu+60BkV43TCQsqPOi16yvm8N+V +jRQ== X-Gm-Message-State: AOAM5322RIg6ZQUUAXtPwIQqS73RIxR9AxVi2BFkA8Wn19xOivhpM0wE CJrgTYjYIDohVOEtJ9HkimHN6AcRD/NAgwSEfzvp08l+mpU398rTnDJ0JBRrmRJWqA3aod84mbg sGTEosYSFUn/8Zg== X-Received: by 2002:adf:e809:: with SMTP id o9mr6519375wrm.137.1612791444999; Mon, 08 Feb 2021 05:37:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbCUE/71sl4ykxHJeD//6I9Vz+CgigCrvPW/h/UvdPj1abvsMHm6Nq/+mV4gi6k9VorznBpg== X-Received: by 2002:adf:e809:: with SMTP id o9mr6519356wrm.137.1612791444771; Mon, 08 Feb 2021 05:37:24 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 02/18] tests/acceptance: Introduce tesseract_ocr() helper Date: Mon, 8 Feb 2021 14:36:55 +0100 Message-Id: <20210208133711.2596075-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 We are going to reuse the tesseract OCR code. Create a new tesseract_ocr() helper and use it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201021105035.2477784-5-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/machine_m68k_nextcube.py | 21 +++++---------------- tests/acceptance/tesseract_utils.py | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/m= achine_m68k_nextcube.py index 3c7400c43e4..09e2745cc52 100644 --- a/tests/acceptance/machine_m68k_nextcube.py +++ b/tests/acceptance/machine_m68k_nextcube.py @@ -7,13 +7,11 @@ =20 import os import time -import logging =20 from avocado_qemu import Test from avocado import skipUnless -from avocado.utils import process =20 -from tesseract_utils import tesseract_available +from tesseract_utils import tesseract_available, tesseract_ocr =20 PIL_AVAILABLE =3D True try: @@ -61,12 +59,8 @@ def test_bootrom_framebuffer_size(self): def test_bootrom_framebuffer_ocr_with_tesseract_v3(self): screenshot_path =3D os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) - - console_logger =3D logging.getLogger('console') - text =3D process.run("tesseract %s stdout" % screenshot_path).stdo= ut_text - for line in text.split('\n'): - if len(line): - console_logger.debug(line) + lines =3D tesseract_ocr(screenshot_path, tesseract_version=3D3) + text =3D '\n'.join(lines) self.assertIn('Backplane', text) self.assertIn('Ethernet address', text) =20 @@ -77,13 +71,8 @@ def test_bootrom_framebuffer_ocr_with_tesseract_v3(self): def test_bootrom_framebuffer_ocr_with_tesseract_v4(self): screenshot_path =3D os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) - - console_logger =3D logging.getLogger('console') - proc =3D process.run("tesseract --oem 1 %s stdout" % screenshot_pa= th) - text =3D proc.stdout_text - for line in text.split('\n'): - if len(line): - console_logger.debug(line) + lines =3D tesseract_ocr(screenshot_path, tesseract_version=3D4) + text =3D '\n'.join(lines) self.assertIn('Testing the FPU, SCC', text) self.assertIn('System test failed. Error code', text) self.assertIn('Boot command', text) diff --git a/tests/acceptance/tesseract_utils.py b/tests/acceptance/tessera= ct_utils.py index acd6e8c2faa..72cd9ab7989 100644 --- a/tests/acceptance/tesseract_utils.py +++ b/tests/acceptance/tesseract_utils.py @@ -6,7 +6,9 @@ # later. See the COPYING file in the top-level directory. =20 import re +import logging =20 +from avocado.utils import process from avocado.utils.path import find_command, CmdNotFoundError =20 def tesseract_available(expected_version): @@ -26,3 +28,19 @@ def tesseract_available(expected_version): return False # now this is guaranteed to be a digit return int(match.groups()[0]) =3D=3D expected_version + + +def tesseract_ocr(image_path, tesseract_args=3D'', tesseract_version=3D3): + console_logger =3D logging.getLogger('tesseract') + console_logger.debug(image_path) + if tesseract_version =3D=3D 4: + tesseract_args +=3D ' --oem 1' + proc =3D process.run("tesseract {} {} stdout".format(tesseract_args, + image_path)) + lines =3D [] + for line in proc.stdout_text.split('\n'): + sline =3D line.strip() + if len(sline): + console_logger.debug(sline) + lines +=3D [sline] + return lines --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791455; cv=none; d=zohomail.com; s=zohoarc; b=Tl6XBBMJ2q2R4+cWc4zRoyjAH86ZN2KtcApYuoNjzk4wWCNLBqNr7h2NqYLDzYf3dkMf3lnb3lRU50RctkDr/cnm0k2kAily2+x+JAIHpGA0Mb6M9N/vuZwx3kMBEzqhghGpQ38kUqZsnzegEIVwB/A2dlABbYZz1wC/r3kESvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791455; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jITNoidllkoIIPBuiQV1gJNrrM15qrzDl0Q/+b51jBA=; b=NhwzmtoIAGeBzzNkmBDmxTK7BzVH11LmQpRuhr5EvGT1y6gAw2jeOkqdy/FNzsFbD6svqHmTHpv9tseB9eAPfDzY0Se+vOJ7qLXeLd2aaNCxoL5iAQhLlENiPaPxMfB0xJezRjYrTfkdnVLdtFU0VH5rS96XsAjKE/zSb7kjJjA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791455067193.6049801058506; Mon, 8 Feb 2021 05:37:35 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-447-G62vxR6-MRKCBw32v6niJw-1; Mon, 08 Feb 2021 08:37:31 -0500 Received: by mail-wr1-f72.google.com with SMTP id e15so13102527wrm.13 for ; Mon, 08 Feb 2021 05:37:31 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o18sm12706252wmp.19.2021.02.08.05.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:37:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791454; 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=jITNoidllkoIIPBuiQV1gJNrrM15qrzDl0Q/+b51jBA=; b=UBLAZnMbhxeg/dWf7nOG4yXU/ZsIdw+pqM0xgPWr2BknFz6noxN6wxE0KNA9EYvLg08ahP OHQgpt/4NgSLwNLofZNeF7ausZESSSKkQALGg67dvPcwG+JLjH3miIsLxqCK9+ouh4aqaK raghRVh8t8F1OW+0hFty082LhSnSusw= X-MC-Unique: G62vxR6-MRKCBw32v6niJw-1 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=jITNoidllkoIIPBuiQV1gJNrrM15qrzDl0Q/+b51jBA=; b=kirqgC0iEGFd7E6S1uJ6aKw6YvWyKxEDnGL+SoxHcrLVxJCLV0GBcy3QSv1nCBxqdf rJjCYcd+IjT7PQzEJuc274MwIencbgcHif9ZCgxuAE+liVbf6wsPcV+WDkpYNrxEKQrg R0zBG38WZqHXirbzQ1pBQNKkZTt8o0yXZ7YskGIdv7Sli1h9mn9f76V4S21gND7hHyO9 V6rTwVOufPtZHX9ckIZDJX5qSZqliM1S3U8pjvlU5FPNaXHM0YBy6ZzglNgpRjr9bQpi VS4o4t92ofmZqUS6J1NEvQTPt7kKKb5n0geoqg2dW3EBLBdGYAry9TVSXhVA6uyJw70L IiHw== X-Gm-Message-State: AOAM532jdLxrA2xymXxXr0HxvczwdsKQGq6CegixVbhJYaX9oO4HZO8D KlUq/s39TvCeeCFl5Li1ZaXvsogcKE1fuTM7nJQ0RMw5RFH/oGUiz4nXiBS4G36BOKHP1Ayl3zN bFvQjN+RNrrHMyA== X-Received: by 2002:a5d:47a2:: with SMTP id 2mr19863843wrb.393.1612791450099; Mon, 08 Feb 2021 05:37:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzOr09k8z7hT2JXJvkdxsrUeG7Zw/0T64qb5hXdp0SOn9dF79fy3bcNpU04uOdaLkgXeK267Q== X-Received: by 2002:a5d:47a2:: with SMTP id 2mr19863821wrb.393.1612791449921; Mon, 08 Feb 2021 05:37:29 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , Niek Linnenbank , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 03/18] tests/acceptance: Extract do_test_arm_orangepi_armbian_uboot() method Date: Mon, 8 Feb 2021 14:36:56 +0100 Message-Id: <20210208133711.2596075-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 As we want to reuse the same U-Boot test for multiple Armbian releases, extract the common part as do_test_arm_orangepi_armbian_uboot(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Bin Meng Tested-by: Niek Linnenbank Message-Id: <20201023131808.3198005-4-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/boot_linux_console.py | 45 ++++++++++++++------------ 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index fb41bb7144b..46835e49dfb 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -802,27 +802,7 @@ def test_arm_orangepi_sd(self): # Wait for VM to shut down gracefully self.vm.wait() =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable dl.armbian.com') - @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') - @skipUnless(P7ZIP_AVAILABLE, '7z not installed') - def test_arm_orangepi_bionic(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:orangepi-pc - :avocado: tags=3Ddevice:sd - """ - - # This test download a 196MB compressed image and expand it to 1GB - image_url =3D ('https://dl.armbian.com/orangepipc/archive/' - 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z') - image_hash =3D '196a8ffb72b0123d92cea4a070894813d305c71e' - image_path_7z =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash) - image_name =3D 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.im= g' - image_path =3D os.path.join(self.workdir, image_name) - process.run("7z e -o%s %s" % (self.workdir, image_path_7z)) - image_pow2ceil_expand(image_path) - + def do_test_arm_orangepi_uboot_armbian(self, image_path): self.vm.set_console() self.vm.add_args('-drive', 'file=3D' + image_path + ',if=3Dsd,form= at=3Draw', '-nic', 'user', @@ -848,6 +828,29 @@ def test_arm_orangepi_bionic(self): 'to ') self.wait_for_console_pattern('Starting Load Kernel Modules...') =20 + @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), + 'Test artifacts fetched from unreliable apt.armbian.com') + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') + @skipUnless(P7ZIP_AVAILABLE, '7z not installed') + def test_arm_orangepi_bionic_19_11(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + :avocado: tags=3Ddevice:sd + """ + + # This test download a 196MB compressed image and expand it to 1GB + image_url =3D ('https://dl.armbian.com/orangepipc/archive/' + 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z') + image_hash =3D '196a8ffb72b0123d92cea4a070894813d305c71e' + image_path_7z =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash) + image_name =3D 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.im= g' + image_path =3D os.path.join(self.workdir, image_name) + process.run("7z e -o%s %s" % (self.workdir, image_path_7z)) + image_pow2ceil_expand(image_path) + + self.do_test_arm_orangepi_uboot_armbian(image_path) + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') def test_arm_orangepi_uboot_netbsd9(self): """ --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791459; cv=none; d=zohomail.com; s=zohoarc; b=ijX8m603eqIrEdpAsNRxLVtLvY9FH1vS5XRaZsGmMEsO0iPN0pa21+8WkhqGWvmdAA9wET/41JPQUnRuQgbHKYl8RZ21t9hTCt5+olqn3BlcDq6FXvSCFm3aNQKg3GzXFpLt4jK59REDT04T+quOScq/vkCh4ZiADcVVIV1z3r8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791459; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tM1jaDm4ni5WMJllemkQfzXNE1ZHzx/FgPDJ4gWto9Y=; b=AtGPKL5TcKn56kk9GytvjXn1iCfTWl49OyiOnuc34QouMHxkDkmR1475gvGvE6RZfg2DURQ3/siD4plNS0EOxQZhLwKwrtbdfRDu28OBSQ5uUwW3aLA2A5aWwnxEjAfIVc0j1zQgiB+9SgGqPVLbCtggtxMhkRJeiXIlc95pHv0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612791459154311.29054262866975; Mon, 8 Feb 2021 05:37:39 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-210-J7QksNN1ODqGVghPYeamDw-1; Mon, 08 Feb 2021 08:37:36 -0500 Received: by mail-wm1-f70.google.com with SMTP id i4so2994783wmb.0 for ; Mon, 08 Feb 2021 05:37:36 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id f7sm28440059wre.78.2021.02.08.05.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:37:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791458; 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=tM1jaDm4ni5WMJllemkQfzXNE1ZHzx/FgPDJ4gWto9Y=; b=BxMCHO/E0lRewixdMPezSp3QWZYsmm0O/PVVPF8D3E3zvr+sFg5V6TMEnNggQEaaIcH4Uq efN/QcQreXkHYWC51nkyf/8PMbVP/9alsgTwA3Snwl0gPqp6LTbpMycNIgI77PE63Zc0Tx XIQXkuRcTSSP+uNRTyv74cuR491cbzE= X-MC-Unique: J7QksNN1ODqGVghPYeamDw-1 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=tM1jaDm4ni5WMJllemkQfzXNE1ZHzx/FgPDJ4gWto9Y=; b=MM3ALqIl2bdXAAaw6AW+eS1h9T+Wym1CzhTxl3M6asPbEgWGpMOnZmXkMZHegA8qcD LHIb3PF0hzPvWDfpcD21ORgwERihj3yA4U97p/bbzfNRQIEZZkHhokK6WCD3TO3Wr0Hf AnBr5P9zpiKdUpE/l7XDW+kdiU7eIWMzYzLAj0c0QVG4x7junehU928ylYvgeDBEPXGP 2CL4u1fSxvAvrPVYAtNIN3Ode5aWv4CyYI1aeTZ49HZ4Dbe0g8oux4+lXc0fKQEf8GpY JKVG1/XpLa5o7AAGJt66XLMiI4ap/xwbjxCUmzbVtXl27oZAIzmBT1NcU4Z7juUugbbj jpJQ== X-Gm-Message-State: AOAM533fp/hY/3uXg1GzrsXIPHYusmqNnu14xHiL6dKIPZQUYS3TZSov RQACNBfygdkNmPoXYKFDu28oe0EpydunevfGq9mlDuHzNZj3s2L+9cFlNML/I87RXZAF91nl29Y 2FEuL9ZDW8wIG8g== X-Received: by 2002:a5d:4a0d:: with SMTP id m13mr20106989wrq.395.1612791454986; Mon, 08 Feb 2021 05:37:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJwsXVciwcqO6JAMaPHzYMr08j8/HPtdAu9pxxWpTmM8CD6QQqbANnOSmNNfePf4PL/DLFw7Yg== X-Received: by 2002:a5d:4a0d:: with SMTP id m13mr20106975wrq.395.1612791454812; Mon, 08 Feb 2021 05:37:34 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Niek Linnenbank , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 04/18] tests/acceptance: Test U-Boot/Linux from Armbian 20.08 on Orange Pi PC Date: Mon, 8 Feb 2021 14:36:57 +0100 Message-Id: <20210208133711.2596075-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 Test U-Boot and Linux on the recent Armbian release 20.08. Suggested-by: Cleber Rosa Tested-by: Niek Linnenbank Tested-by: Bin Meng Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201023131808.3198005-5-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/boot_linux_console.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 46835e49dfb..128ed5500fa 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -851,6 +851,31 @@ def test_arm_orangepi_bionic_19_11(self): =20 self.do_test_arm_orangepi_uboot_armbian(image_path) =20 + @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), + 'Test artifacts fetched from unreliable apt.armbian.com') + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') + def test_arm_orangepi_bionic_20_08(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + :avocado: tags=3Ddevice:sd + """ + + # This test download a 275 MiB compressed image and expand it + # to 1036 MiB, but the underlying filesystem is 1552 MiB... + # As we expand it to 2 GiB we are safe. + + image_url =3D ('https://dl.armbian.com/orangepipc/archive/' + 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.= xz') + image_hash =3D ('b4d6775f5673486329e45a0586bf06b6' + 'dbe792199fd182ac6b9c7bb6c7d3e6dd') + image_path_xz =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash, + algorithm=3D'sha256') + image_path =3D archive.extract(image_path_xz, self.workdir) + image_pow2ceil_expand(image_path) + + self.do_test_arm_orangepi_uboot_armbian(image_path) + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') def test_arm_orangepi_uboot_netbsd9(self): """ --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791464; cv=none; d=zohomail.com; s=zohoarc; b=HEBG2MDpZ4a4MBJOoGz3tUAJK2FA7n0XAWr1Lvk0g+IRX+PHWS8JiIUmGzP6XJcuXkK1dxb0OScME3FAU9Jg+5xU90vg06f8gqt90n3Kc5yJ0XBrrs2mnMiHex7GMC15Xqsm3CxkiRRMSj8LD1yT9BskH65SDueEiZtSw4K60rY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791464; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=66bSMIFkIkZmQrm1Ry+JjRCtbU2MWpZ0aOcsnJln2cc=; b=nrrEc9JYHTQB5q4RnKck7YS0hBhOEs746UpfGYixeNuVXHgKTPOtXnS05byJMJu0S34DTwyenVB/6FnbasbX2NWg0bhDNFhjghCwUdlEMk0g2ZHuc/qn7IP9KV6GcvB3RZHgk0sMURJMNiFg11ENaOtO4UxnrTUOvzkSFc19OOQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 161279146489176.99592060433179; Mon, 8 Feb 2021 05:37:44 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-486-tFs9sCyPOpevagCihxNWwA-1; Mon, 08 Feb 2021 08:37:41 -0500 Received: by mail-wr1-f72.google.com with SMTP id f5so2993332wro.7 for ; Mon, 08 Feb 2021 05:37:41 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id d5sm9034515wrb.14.2021.02.08.05.37.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:37:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791463; 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=66bSMIFkIkZmQrm1Ry+JjRCtbU2MWpZ0aOcsnJln2cc=; b=isYX7/XHycy4Yr74RYPcYd2Zxi01sj7ccbLOKITtHM6NpavvPeDeBFQ4bdi1u//N2rHK4f 3RjW0E00YWOe/uAiKbnanVwNm7WoEyaqRPDy84gBaT8PiHB7h4OMqZfX4FUABs5X7UKi5b A+wjyM6a68XBYBtyGGhYLY2ahcyhdz4= X-MC-Unique: tFs9sCyPOpevagCihxNWwA-1 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=66bSMIFkIkZmQrm1Ry+JjRCtbU2MWpZ0aOcsnJln2cc=; b=q34VOSitGoR70D8A/VLBdCQY2CM8AGbuwFhrKyz1aTiRto/TC4E86V98zv2N3kMVhy /Ln4Qu8KyBixPuctvrerRaR6yO+vRqv1L88JFH8BiopHHUqLaMnIHXFW/Cg4AtB61jnw JBWIpQrjHNahEBhW7TSB7aEqx2urzkIHG/DgwrAm9MOyjFF97s7xqsBrPuCcZTU6TdCV PSv8HAh7mriRv9x92z+vjveoWZdF+I8ExAWOv+kEHfwkSd5oe++T65Q+2TvOCrmfS/ad RoNFYL+d74Jd+II8G5oacIjVLB3ua0jKBLMxpEtc6OKj1X4CE081cJYczrVo3geNZBCk aozA== X-Gm-Message-State: AOAM531Nzhc9W23Bgo8tAQ7iyBF1DLrIzASclIph0dL5XfUCGkMLYKkj /US9w6tgsgl7lprvv4Ea2c3i51DjonOMln+2C459RSVkvprfq59Pcscc4OtB3ouwbN4FBAxm3Wb GjiNHK9rGDHlbyg== X-Received: by 2002:a05:600c:3510:: with SMTP id h16mr14479008wmq.156.1612791460111; Mon, 08 Feb 2021 05:37:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsBq+lcYGmTUQVztfszMvYcCDvOfBb6kqcOWcCB4n54EZU/Wtcl3iuQbEDOEW1OYEea/gv1w== X-Received: by 2002:a05:600c:3510:: with SMTP id h16mr14478997wmq.156.1612791459918; Mon, 08 Feb 2021 05:37:39 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs) Subject: [PULL 05/18] tests/acceptance: Move the pseries test to a separate file Date: Mon, 8 Feb 2021 14:36:58 +0100 Message-Id: <20210208133711.2596075-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Thomas Huth Let's gather the POWER-related tests in a separate file. Signed-off-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Message-Id: <20210112164045.98565-2-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + tests/acceptance/boot_linux_console.py | 19 -------------- tests/acceptance/machine_ppc.py | 34 ++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 tests/acceptance/machine_ppc.py diff --git a/MAINTAINERS b/MAINTAINERS index 8d8b0bf966d..9543d7c44a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -281,6 +281,7 @@ F: target/ppc/ F: hw/ppc/ F: include/hw/ppc/ F: disas/ppc.c +F: tests/acceptance/machine_ppc.py =20 RISC-V TCG CPUs M: Palmer Dabbelt diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 128ed5500fa..c34075d5378 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -1004,25 +1004,6 @@ def test_alpha_clipper(self): console_pattern =3D 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) =20 - def test_ppc64_pseries(self): - """ - :avocado: tags=3Darch:ppc64 - :avocado: tags=3Dmachine:pseries - """ - kernel_url =3D ('https://archives.fedoraproject.org/pub/archive' - '/fedora-secondary/releases/29/Everything/ppc64le/os' - '/ppc/ppc64/vmlinuz') - kernel_hash =3D '3fe04abfc852b66653b8c3c897a59a689270bc77' - kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) - - self.vm.set_console() - kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + 'console= =3Dhvc0' - self.vm.add_args('-kernel', kernel_path, - '-append', kernel_command_line) - self.vm.launch() - console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) - def test_m68k_q800(self): """ :avocado: tags=3Darch:m68k diff --git a/tests/acceptance/machine_ppc.py b/tests/acceptance/machine_ppc= .py new file mode 100644 index 00000000000..51bbfd411ca --- /dev/null +++ b/tests/acceptance/machine_ppc.py @@ -0,0 +1,34 @@ +# Test that Linux kernel boots on ppc machines and check the console +# +# Copyright (c) 2018, 2020 Red Hat, Inc. +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern + +class PpcMachine(Test): + + timeout =3D 90 + KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' + panic_message =3D 'Kernel panic - not syncing' + + def test_ppc64_pseries(self): + """ + :avocado: tags=3Darch:ppc64 + :avocado: tags=3Dmachine:pseries + """ + kernel_url =3D ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/29/Everything/ppc64le/os' + '/ppc/ppc64/vmlinuz') + kernel_hash =3D '3fe04abfc852b66653b8c3c897a59a689270bc77' + kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) + + self.vm.set_console() + kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + 'console= =3Dhvc0' + self.vm.add_args('-kernel', kernel_path, + '-append', kernel_command_line) + self.vm.launch() + console_pattern =3D 'Kernel command line: %s' % kernel_command_line + wait_for_console_pattern(self, console_pattern, self.panic_message) --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791477; cv=none; d=zohomail.com; s=zohoarc; b=GXeI8PO3W8U7ap0o+yr91thpql5x5ybPZ2lpfHNCBAA6rT3ypKYfG5fkycADJQ/ubckqJpfrbzwpWsGl1I+CgOiXHNfrSkO95mtj1PZi9wf0g/eFMDlBGRX0vX9206X558DyBu5Z/rhMwZDF5a+qQvf5TEPf/CKaVDQ6RAsEja8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791477; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=CqAFvg14A1cTs7I1Mx+cHId3dmqwXGNwM8OI3b5gkVo=; b=DZ3TeTVOnzRs+8sP+80YD4M0OTGSW23BLW9hlhZo1Ugg7GnHD6P0wkUsV53FXBkCdXmyNmIvuDweEXjolsxyxzqUN7acMymgvdJSxHHDA48PXDnilA6N0RSZ7vokigggQysKzb1C6Jcidfp/zRy+zm7G7v4I08tBHApEWpX9N0U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 161279147701012.049792490229038; Mon, 8 Feb 2021 05:37:57 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-555-Z2V70XkROUq1UIU6tphjJA-1; Mon, 08 Feb 2021 08:37:48 -0500 Received: by mail-wr1-f69.google.com with SMTP id c9so2540021wrq.18 for ; Mon, 08 Feb 2021 05:37:46 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o124sm21625659wmb.5.2021.02.08.05.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:37:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791473; 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=CqAFvg14A1cTs7I1Mx+cHId3dmqwXGNwM8OI3b5gkVo=; b=b60xPM/5dEddiSHrogm7vljjuqOG06BwHioIkl7cbnTlHTcaqpJQ1YWxFaq9LT6O23zcRg 9/A2OrVDkjnb1uADdVU++uWccJQHwB+FdEMZpi0ka9+hKHccgFChHAnJPWvfVxObBYuQjr T8pGvP0qGaH8aK/TApbI0LQCcSj/2Yw= X-MC-Unique: Z2V70XkROUq1UIU6tphjJA-1 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=CqAFvg14A1cTs7I1Mx+cHId3dmqwXGNwM8OI3b5gkVo=; b=czPfObHpUNF1TG8TWfTxRviss9MzMXjtdJRZYqZFUrU8PZsTEJBvcyVS6EmggEk7ZA 8Xo9Rd83OZfqZMuSc1VafR32HAVO/tzjmvRgyLD731Mwr0N9md+Qag21ZXsUTp982z/J 053h5b/NSnqQOwQV+i3eTtLjxD66wWOLpBVXWP5i7EZbf2wmxQbiPdCpLZhJCCyGah2V qW22JDVZN+6Na0KfhNtAJdWM4n7FMSBlaHkQz8t2W85uCYzM0ZWoy1O+QCN/fRJ58fnI RRF9W8G4BlLX/6fpFUsoP10L4S2CsdUGGGfg6A1LlbgUQ39i8q1QdJLHF382D05ovSYH +tAA== X-Gm-Message-State: AOAM530y802aSgdCAagGPJECkfazCvNNES7vaXMyO7OIxh58dxQqXPvH PfI+dOh/so4dUnIoO2vC9Am2EUdsBASumMeZbq+9V2QVJcF1F3t/2EOQguCgQxCh2aspxZSL+Up BZjKpANk1Y74C7Q== X-Received: by 2002:a05:600c:6c5:: with SMTP id b5mr12397457wmn.137.1612791465428; Mon, 08 Feb 2021 05:37:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxGOjSLYidnrp36SYIDfZzRHPO46/H3KSAMAxs2rh84+Lr/hP4BwHp7efSOie72f7fYlYPoNg== X-Received: by 2002:a05:600c:6c5:: with SMTP id b5mr12397438wmn.137.1612791465152; Mon, 08 Feb 2021 05:37:45 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , Willian Rampazzo , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Greg Kurz , qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs) Subject: [PULL 06/18] tests/acceptance: Test the mpc8544ds machine Date: Mon, 8 Feb 2021 14:36:59 +0100 Message-Id: <20210208133711.2596075-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Thomas Huth We can use the "Stupid creek" image to test the mpc8544ds ppc machine. Signed-off-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Acked-by: David Gibson Message-Id: <20210112164045.98565-3-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/machine_ppc.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/acceptance/machine_ppc.py b/tests/acceptance/machine_ppc= .py index 51bbfd411ca..71025d296c5 100644 --- a/tests/acceptance/machine_ppc.py +++ b/tests/acceptance/machine_ppc.py @@ -5,6 +5,7 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 +from avocado.utils import archive from avocado_qemu import Test from avocado_qemu import wait_for_console_pattern =20 @@ -32,3 +33,19 @@ def test_ppc64_pseries(self): self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line wait_for_console_pattern(self, console_pattern, self.panic_message) + + def test_ppc_mpc8544ds(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:mpc8544ds + """ + tar_url =3D ('https://www.qemu-advent-calendar.org' + '/2020/download/day17.tar.gz') + tar_hash =3D '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494' + file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) + archive.extract(file_path, self.workdir) + self.vm.set_console() + self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin') + self.vm.launch() + wait_for_console_pattern(self, 'QEMU advent calendar 2020', + self.panic_message) --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791474; cv=none; d=zohomail.com; s=zohoarc; b=edOOhsUuBcyrsMEcIp6T9EEuVZCnhtEsITueXxdh+dz4OeWfG35KV6r9ld8uNzjgB2OzcvfIBxyoAs6PWdqEjLsh7d/3gqA9CwZzq4T4C2omVY7eX2xeMCAUhCsjwUjwbzyLXJ8YwbHjyiBcu0wiO5GnVbswwXjj4lMD/hJ/HZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791474; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tQ7gcwIJyEjX0zd59lKnvbrHOtNccVSpuCuwvlX+x68=; b=SD+ixyHFOQwcnBxMyz68gEvqlPC0VJV9tKnUmCeUegPUc6tQwVec6u5+cj9yTEpqZS/C3BAo/g+4M7xKghQolAXZ80fepllpJa2rUNAomRD050TYjb7pvOqZ3viTt4/300huA5pJM8eqcLO7yL1FzIPh86jAuPcYyDHIlR+OqKo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791474631842.3752377783987; Mon, 8 Feb 2021 05:37:54 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-35-Rr1BYHLqPgaS9VFqPw6niA-1; Mon, 08 Feb 2021 08:37:51 -0500 Received: by mail-wm1-f71.google.com with SMTP id o18so6402959wmq.2 for ; Mon, 08 Feb 2021 05:37:51 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z4sm28610257wrw.38.2021.02.08.05.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:37:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791473; 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=tQ7gcwIJyEjX0zd59lKnvbrHOtNccVSpuCuwvlX+x68=; b=OwVlCPb4mwRVQfDKqdRKIF2qEEBJgUpPuXe513P2CsHKL8HD9igZm2koUhCZS878utjsPb 5bpkQtYAskjALB3TTY+KIlQkk/ojs+C5oTCOgZlhZg7JSvpMrd77Wjln0N1XD5Myjn+EYr UvNFFBM0uCMxmDknewPC12dEAiv5o04= X-MC-Unique: Rr1BYHLqPgaS9VFqPw6niA-1 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=tQ7gcwIJyEjX0zd59lKnvbrHOtNccVSpuCuwvlX+x68=; b=n3amG77BZmDQjPbBfTaTtqLs7+E6Ay6bu+F+2oBIS5UA3PRhyUl2yMsLjJFI2zHtVl 7q9EQ6H2pPcOnz9sEpDlib80vs1L2b3g7rZvhaZ1Dqm9MesKQuZyfGMUHjFdythS3Jsh EH/ZtDJmQ4hJOL66la3oitJ7Q2YdBJcOJn9BucwDUaynMq7Xf8+aLNDS/QRfRgeU/tYe AdOmSt3qY2tQyGbJqC1q9Rgtkd8dWPvj9Q/C94ZloFXUm/S2RduqY02x3g/BACsWSB1o 1jVCpjYQ06o3d0MMf0fktvsqMGewtN03eE4O33JO6SUErRmdON+f2WYMct9yLyQBiIqd hsLA== X-Gm-Message-State: AOAM533E+QHJE+2sbPnGbqYjThzf6IV18NI83WQVTtWRjIdQqEK2KISi 43XZjVCR7dtHlIGN8h6SpeDi6Iou6tOpc3PDX8c8rChlmtlFTVjkUDlWjjqCNoEuEBsGGGY5v9z 61rFKL4im+QcGmQ== X-Received: by 2002:a1c:bcc3:: with SMTP id m186mr7642794wmf.165.1612791470852; Mon, 08 Feb 2021 05:37:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoLovhfKM44tbrkJ7pK9KWK+o5YraYN1AYYaEu+dXfImgiwVVZxhVAZ7cuN8yOdA7PLvZWTA== X-Received: by 2002:a1c:bcc3:: with SMTP id m186mr7642773wmf.165.1612791470584; Mon, 08 Feb 2021 05:37:50 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , Willian Rampazzo , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Greg Kurz , qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs) Subject: [PULL 07/18] tests/acceptance: Add a test for the virtex-ml507 ppc machine Date: Mon, 8 Feb 2021 14:37:00 +0100 Message-Id: <20210208133711.2596075-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Thomas Huth The "And a hippo new year" image from the QEMU advent calendar 2020 can be used to test the virtex-ml507 ppc machine. Signed-off-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Acked-by: David Gibson Message-Id: <20210112164045.98565-4-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/machine_ppc.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/acceptance/machine_ppc.py b/tests/acceptance/machine_ppc= .py index 71025d296c5..a836e2496f1 100644 --- a/tests/acceptance/machine_ppc.py +++ b/tests/acceptance/machine_ppc.py @@ -49,3 +49,21 @@ def test_ppc_mpc8544ds(self): self.vm.launch() wait_for_console_pattern(self, 'QEMU advent calendar 2020', self.panic_message) + + def test_ppc_virtex_ml507(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:virtex-ml507 + """ + tar_url =3D ('https://www.qemu-advent-calendar.org' + '/2020/download/hippo.tar.gz') + tar_hash =3D '306b95bfe7d147f125aa176a877e266db8ef914a' + file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) + archive.extract(file_path, self.workdir) + self.vm.set_console() + self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux', + '-dtb', self.workdir + '/hippo/virtex440-ml507.dt= b', + '-m', '512') + self.vm.launch() + wait_for_console_pattern(self, 'QEMU advent calendar 2020', + self.panic_message) --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791480; cv=none; d=zohomail.com; s=zohoarc; b=ht9dHItvGode1Mx0A+RqhXaK/umWM++6lkTAHBz8VC90vLOO//PIVm0ylIpRi9E6QOecI5UtRpLic9c/3penOLeef8Kt79FcNvCs8iwhjLDBJ/hsVDnhewdFKc+NTKUmoBImJoHmZKSCnTfwETPMwx4+NoptvEMOUVdhBpLCmyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791480; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Zd2sUby5yhKeqxKOsP+O8+QU7t821C4Cc3m/BR5oUhI=; b=ilfFhvzefkmtJpJ46AO3osU6HTQQnhtM5KRCNGr7ACtmwvMfgmbu4l/eE0sEeGS7RlTmwZgMs7dhZ6y3ERNjVepIPFe1kRpe0uz+D+gGSnUPEp7YQNXUBuqm/WxqldmhoQQlPAVtSGITsMDJ9orGRjT9EkJHZRnECD/McTw8zCA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791480164221.99464547317177; Mon, 8 Feb 2021 05:38:00 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-261-Lu7o-2QNM2mdxBLCHkQzww-1; Mon, 08 Feb 2021 08:37:57 -0500 Received: by mail-wr1-f71.google.com with SMTP id x1so6416210wrg.22 for ; Mon, 08 Feb 2021 05:37:57 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id k11sm14738930wrv.51.2021.02.08.05.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791479; 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=Zd2sUby5yhKeqxKOsP+O8+QU7t821C4Cc3m/BR5oUhI=; b=En2gf6GO4PQfgeoFa1aK4ZwDBieq0YF33ExH/mjTVRkpx6xNv96hXtMns80l78pVKBoQXz s69yJLwOwF/nhfivMAyA9p3nNgIne9h0AZk8NVrZq9mYc3x4AWeC70DUERNUTJCvm2kajg /njXVuzPNNe6pGIxdTOQW7GFbNvTs10= X-MC-Unique: Lu7o-2QNM2mdxBLCHkQzww-1 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=Zd2sUby5yhKeqxKOsP+O8+QU7t821C4Cc3m/BR5oUhI=; b=YuCDm3YeLumUP7F2dDXTv+Hyl6fTR+trRMW6B6UlIBdXHmz7d2lIHOxpmiOU7n9bx5 k+qeItDd5Pn9pNGnGe3N7omXc2leZIvfvnPdCKeoGOdI0uzxgkCo/OhgeQP8k2Cq447l Qb1UHx+xx2Z9lqJg8WxQHQJbpqBxeEKiYXjmF5xRkrY/3RfK3xyOPaYCyRgh7d/Jt0WD qKh19SKDegG2keW64gT4sw5VcCaMwDhNnzqcVMiZ4BaQOr7HQ/xmTayWY0LrpDROByIy bT2ytQYYMTCnVH4v8sCJIMqOASL9U9K5t/8U0s3U7f6sj7lEOnURqET2Q31SngkkjhmG QBUg== X-Gm-Message-State: AOAM530XzWXxPjZDNsDsUfIX4orBxbFpwpLKCoPyKLZ6YZko1IzCUw2e FoNqJIt3R0TLoourPhhDylzRf+Z2UQ4WRNcmjeYgmIEHGTq3eXh+TMELfSTu1lCIZ+ET4eV9nPN uYpZYCvymU2VkDA== X-Received: by 2002:adf:efc2:: with SMTP id i2mr19503443wrp.422.1612791476246; Mon, 08 Feb 2021 05:37:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJy8ZuS3cyjdXoQRQ9Dnw1GIXZcyaQ9W9UqBNZbI1HUyoc9FCD0aX9rp11GgC9p05cBmFgCS4w== X-Received: by 2002:adf:efc2:: with SMTP id i2mr19503423wrp.422.1612791475975; Mon, 08 Feb 2021 05:37:55 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , Pavel Dovgalyuk , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pavel Dovgalyuk , Paolo Bonzini Subject: [PULL 08/18] tests/acceptance: Increase the timeout in the replay tests Date: Mon, 8 Feb 2021 14:37:01 +0100 Message-Id: <20210208133711.2596075-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Thomas Huth Our gitlab-CI just showed a failed test_ppc_mac99 since it was apparently killed some few seconds before the test finished. Allow it some more time to complete. Signed-off-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta Acked-by: Pavel Dovgalyuk Message-Id: <20210127065222.48650-1-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/replay_kernel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_ke= rnel.py index 772633b01da..c1cb8624683 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -31,7 +31,7 @@ class ReplayKernelBase(LinuxKernelTest): terminates. """ =20 - timeout =3D 90 + timeout =3D 120 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D1 panic=3D-1 ' =20 def run_vm(self, kernel_path, kernel_command_line, console_pattern, --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791485; cv=none; d=zohomail.com; s=zohoarc; b=mKs/OCw2wgB8DwGE2+5hNf7NYZJsqz3ku4J4cZ9f7c7K0U0q+b7gWyb+tk9+xiIsTTldCiu4aYYL6rlzIyER2oa1cbsM8IyVyi3dS7pXIfQ9g6vgLgGwvYQWG1kesmSattUGOP28ETPVpqDLtTBteFxqTFb5HCeS75eKqF5sYag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791485; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=rrjRolBqzvx3TVpQAliwRxg0JEen6JUgkxKwhs5FXZA=; b=UxnGizGjtlJEQBLvL4LDXXjjLM1mRw4pM2klEU17ty2T0DnjDgFNBhH7dL8N5hQfK72pD6lWn5spBE3L9JeRxhluw1eWuir1ih8Pf0ZI39/3mexvb7No3tHMguSBNMcVJCvxVZT2cUMWu1joAyHj/QECYwA/uiFg+m/lEChcEbQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612791485635120.45219331351143; Mon, 8 Feb 2021 05:38:05 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-C7iSGJ3jPw-2S1hD6m-qZQ-1; Mon, 08 Feb 2021 08:38:03 -0500 Received: by mail-wm1-f70.google.com with SMTP id j204so8778685wmj.4 for ; Mon, 08 Feb 2021 05:38:02 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id c62sm21511657wmd.43.2021.02.08.05.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791484; 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=rrjRolBqzvx3TVpQAliwRxg0JEen6JUgkxKwhs5FXZA=; b=hF+lTt7r2iwpEWjW9K6/+jNmIshkSg1wqW4Jjw9oXtrgb2PTWTcxfkZlleB7F9ZTN9EheJ Z0pWa9ehYNSfLO/MQEs7nuzAX8Zc5OfdFXyEE+PwRQBn/DrRtDqrxzVjV2bwzZmSmcecVR UpOY86dWo7v125ildT7l4UhTPrSPnBw= X-MC-Unique: C7iSGJ3jPw-2S1hD6m-qZQ-1 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=rrjRolBqzvx3TVpQAliwRxg0JEen6JUgkxKwhs5FXZA=; b=Y43JHmBJKJhrXXAOz9GAXwmXmVrv0unIJKYgj/lJE1/mg9l+6u2HZJby828ruTXBhH TKClB2oq4yEk2SeKJF8aXHICaxjLpG8IDEg7Gg8ifoYXzbWjhByzdifMAPlDqjzETYR8 5H69EPjp9n+9jz0ANy1Gh5bl+nwhRlInhYVzvivP9SojSOa5uAQz3g5AnIVRC31TiDak mE+0o6oyZryWNxeJuR2T5XoCgZ91od3Ysdo8JgRNvO6kj3br1znbf+AKgmMjC9Y1Xj8G T41iNoipuk2DjdfogGHOBlIs2397++rKajfQNKAc6D0DWf1FqPyHEHy2MNlL3h62cEP/ EXrQ== X-Gm-Message-State: AOAM532pFmymrfJU2WIbd5vhxdfqUpGTJGh4m3tJlbQZqvCjCbebGJ1i 4Aqw94VDMEC0z9pCQQKvLWM6e16a6n6ETqcgeVX8AWYAbT8/wDRfBOnja3IGjXcSrCNmTtA+dm0 Wzfima1VlaLF3UQ== X-Received: by 2002:a1c:9ec9:: with SMTP id h192mr15260525wme.28.1612791481421; Mon, 08 Feb 2021 05:38:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJyGMGl9n0x6oci64XMlQsIp/DAD0K7AOnK/74rceQMatDzuRGgZfLYHRig9G0yoiDR/8QOXhw== X-Received: by 2002:a1c:9ec9:: with SMTP id h192mr15260506wme.28.1612791481091; Mon, 08 Feb 2021 05:38:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [PULL 09/18] tests/acceptance: Re-enable the microblaze test Date: Mon, 8 Feb 2021 14:37:02 +0100 Message-Id: <20210208133711.2596075-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Thomas Huth The microblaze kernel sometimes gets stuck during boot (ca. 1 out of 200 times), so we disabled the corresponding acceptance tests some months ago. However, it's likely better to check that the kernel is still starting than to not testing it at all anymore. Move the test to a separate file, enable it again and check for an earlier console message that should always appear. Signed-off-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210128152815.585478-1-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + tests/acceptance/boot_linux_console.py | 9 ------- tests/acceptance/machine_microblaze.py | 35 ++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 tests/acceptance/machine_microblaze.py diff --git a/MAINTAINERS b/MAINTAINERS index 9543d7c44a2..99621abf8d7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1119,6 +1119,7 @@ M: Edgar E. Iglesias S: Maintained F: hw/microblaze/petalogix_s3adsp1800_mmu.c F: include/hw/char/xilinx_uartlite.h +F: tests/acceptance/machine_microblaze.py =20 petalogix_ml605 M: Edgar E. Iglesias diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index c34075d5378..eb012867997 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -1056,15 +1056,6 @@ def test_m68k_mcf5208evb(self): tar_hash =3D 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c' self.do_test_advcal_2018('07', tar_hash, 'sanity-clause.elf') =20 - @skip("Test currently broken") # Console stuck as of 5.2-rc1 - def test_microblaze_s3adsp1800(self): - """ - :avocado: tags=3Darch:microblaze - :avocado: tags=3Dmachine:petalogix-s3adsp1800 - """ - tar_hash =3D '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f' - self.do_test_advcal_2018('17', tar_hash, 'ballerina.bin') - def test_or1k_sim(self): """ :avocado: tags=3Darch:or1k diff --git a/tests/acceptance/machine_microblaze.py b/tests/acceptance/mach= ine_microblaze.py new file mode 100644 index 00000000000..7f6d18495d8 --- /dev/null +++ b/tests/acceptance/machine_microblaze.py @@ -0,0 +1,35 @@ +# Functional test that boots a microblaze Linux kernel and checks the cons= ole +# +# Copyright (c) 2018, 2021 Red Hat, Inc. +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern +from avocado.utils import archive + +class MicroblazeMachine(Test): + + timeout =3D 90 + + def test_microblaze_s3adsp1800(self): + """ + :avocado: tags=3Darch:microblaze + :avocado: tags=3Dmachine:petalogix-s3adsp1800 + """ + + tar_url =3D ('https://www.qemu-advent-calendar.org' + '/2018/download/day17.tar.xz') + tar_hash =3D '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f' + file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) + archive.extract(file_path, self.workdir) + self.vm.set_console() + self.vm.add_args('-kernel', self.workdir + '/day17/ballerina.bin') + self.vm.launch() + wait_for_console_pattern(self, 'This architecture does not have ' + 'kernel memory protection') + # Note: + # The kernel sometimes gets stuck after the "This architecture ..." + # message, that's why we don't test for a later string here. This + # needs some investigation by a microblaze wizard one day... --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791498; cv=none; d=zohomail.com; s=zohoarc; b=XRDQgbhiyWuTB/22w+YZIByUi4UaZ8ZjSKN2iA2KdnP4wB4g4Gq0CyiQ3yj1lOwttlYc6g842HJcIuQ37dnjajaYLb2op4pk6VG8+FVdqcL15wrUUW8S3oXFXKQaDZIORmj1b3JW8Y0xGFiTDu6tbJknFRJwhAjjkb5xnIJxrdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791498; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tQqqhHVMsVsFY7bRJoze1V3h8iOjQeP6Azr1lzMcONQ=; b=AhVW0zj7izDLqe7Jmibix0z7Fj/fr6+5s0EGj2lP5fuVj48D4mIMjO3GtULYXgGA7vSTl8ByezaAWv2MEyOxrAIKnOy7tG4qmjzMR7T6SBF/QD7k2jKGp3Gxzp/JbEb6sJVTemrflP0+vk/mm+8UHK4TuFmQAy4YtToFebJUT/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791498723551.2043742106339; Mon, 8 Feb 2021 05:38:18 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-169-4szVgpI-Nnul9RQcB1ZcIQ-1; Mon, 08 Feb 2021 08:38:14 -0500 Received: by mail-wm1-f69.google.com with SMTP id q24so8660643wmc.1 for ; Mon, 08 Feb 2021 05:38:13 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id w25sm21038768wmc.42.2021.02.08.05.38.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791497; 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=tQqqhHVMsVsFY7bRJoze1V3h8iOjQeP6Azr1lzMcONQ=; b=HxMb5TPLMAoeHeRDbIaOL9YnmGR133eIL1cm0Hj08I1/qx/VsfMpViQlFRc3ASMLDVuD2q 5jIyWOSAUj4Hey/MXAZdOSc3wvGPndQsKckckp75BEj3hIVeeADSYH83l4CyTAhQ3mxB2r pl/mjxHcxozMlqohU4UNz8qafe74Nwo= X-MC-Unique: 4szVgpI-Nnul9RQcB1ZcIQ-1 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=tQqqhHVMsVsFY7bRJoze1V3h8iOjQeP6Azr1lzMcONQ=; b=pEGRak0EX03/3rUh1a7wWZEO0AS8JBUdOU0JtTkMr7RVh7ayqm4zTIc8D+ENqs2bft fgbBNkMx0rXWlh7hi/DFoeDsvGj71kpmz41uCRSp80pDm3fQs4XMxJsweDrd5bWMxIgx 2vsrcf2FxVO0wrIX0B8sLAAMK6td1mFQaPIw1nYffV+fTSuYBZ/IXGe1C8O5ebGczeSk y7LIkY27JS3qICGRImc6RoUtT5tn00R/YfJWMInPszPsL1pvxaBeZmOxPO4HYsR/2E83 ILFA2046Sl5FB88jrpbs4SA+ZhkNZxkAhxfVS0crF2TUQzwMDZlk5vPKEsPlZJ/8HB1s ohZA== X-Gm-Message-State: AOAM533t1+cEwUgsf3wfcdJGxhM38Jgz2pcklYjM+ffbRnVaR8gVh0OH Vq0z2q+iBsU83XSfWScLcW7NJowrtVhN/AJY1t4JAxnLiBzuJSmxk/ewR5Qd1+A+L3ccK6zFiRx iA6j2ImcIXAkWWg== X-Received: by 2002:a05:600c:4857:: with SMTP id j23mr3417845wmo.66.1612791489324; Mon, 08 Feb 2021 05:38:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxesWyA+5r0Csr1qqiAIr8f86uV1/nkrqgrVNsD2ZKeGWD5red28OGzbPUpXRlwonylxXzu9g== X-Received: by 2002:a05:600c:4857:: with SMTP id j23mr3417669wmo.66.1612791486323; Mon, 08 Feb 2021 05:38:06 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/18] tests/acceptance/boot_linux: fix typo on cloudinit error message Date: Mon, 8 Feb 2021 14:37:03 +0100 Message-Id: <20210208133711.2596075-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cleber Rosa Signed-off-by: Cleber Rosa Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Beraldo Leal Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210203172357.1422425-2-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/boot_linux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 1da4a53d6a1..2ac3e575874 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -70,7 +70,7 @@ def download_cloudinit(self, ssh_pubkey=3DNone): phone_home_port=3Dself.phone_home_port, authorized_key=3Dssh_pubkey) except Exception: - self.cancel('Failed to prepared cloudinit image') + self.cancel('Failed to prepare the cloudinit image') return cloudinit_iso =20 class BootLinux(BootLinuxBase): --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791497; cv=none; d=zohomail.com; s=zohoarc; b=n45vruJzCZYWU0w8Fdk78ZBzhLwyy+4Dh4zqiVu5z8zg7H1ZOh95DyrSesUYJn5UZ40X+qQQZZEIxyBYskj9IS6wbQXqEAxsY+IVbfC6wnl7BZyIriwlyxxHT3kKlcPCN6/mNA0WX/Hrnut/NhIPS4OKPvNZMZ54qcaFXxXG5yM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791497; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Nm/ExYlKufTmMZyvqaMCH5BvpDN6afR/9tY/eyJ/hhU=; b=TdsbaWU2HFGUifDAoevz67uJ5oyozC/kzh2j80ndhk73mT/2UGXL3jUS7IejgEQ/bDFxUhsgh/rUX+DevDleeWEwhr+mL8Oxws6KNGg61PhvEnUfjKI3B2pyMfaUGsurCju8q02HMb/bxpTucROFeAT4ab/Eyx24v151zLNI7k0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791497167577.5558506167706; Mon, 8 Feb 2021 05:38:17 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-573-v5QPD93lMWuJm9lvcXbfuQ-1; Mon, 08 Feb 2021 08:38:14 -0500 Received: by mail-wm1-f72.google.com with SMTP id n17so6514027wmk.3 for ; Mon, 08 Feb 2021 05:38:13 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id s64sm22086029wms.21.2021.02.08.05.38.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791496; 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=Nm/ExYlKufTmMZyvqaMCH5BvpDN6afR/9tY/eyJ/hhU=; b=dNw+7DDLvIc+bG7LhjYUPFlwNqO5lA2jfNZyyOtYeTIkHe6DSwmadrQy0TQl80N00hLPdX fiJaZU1WOIXafWXt1yPHwv8X8xY/fiGNzARqgWEmelC4kcOLcRjWB90eRbTObApI+j94g3 2S4aY/0QZjOSirdvGzSWDaVnpprSySg= X-MC-Unique: v5QPD93lMWuJm9lvcXbfuQ-1 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=Nm/ExYlKufTmMZyvqaMCH5BvpDN6afR/9tY/eyJ/hhU=; b=arrbyCh37uknLvhhikBmhgyTocwkOLmL8UiEXr/HD132gfKw9+wNIzmC/bcJgpI/wB haSKAoBWV/OZJisee2kM00mMeC5FYnkh2Lof+JghwNv7RyMS1Oh7woRDPQxEAxSSAx5b YMsHyPs4g/AlbmNtwGqLegi9qMEKpzE28MYSiC3WV7ohMcZjXvTJXqEloqkPsHUFVnp8 ChWqx0Q0FaPKL9XimaC5ASFlZlr8jyk+vIL7J6Vc2esIn8F9YJHDaHP5dhFbA4fvug1Q lfPB6YbYJelt7jhxpbpMwW08M6hR0tFV29lMlCItwO3CNsHvsNPwyIU/ir36pPaN94LN Nyxw== X-Gm-Message-State: AOAM531i7uvpEK88GMtAUDh1Fok80nUGcPvLwLRaLuJtXfdmw+6RpdiI SfhEdquZPV3Zej/McAwbGuUrwKVX4dR4OTTvVbxC1CHomSa2Xs3+cHqQUJyz03EjQ6kTRiVAgoL qDeny2Oj4B+xiBQ== X-Received: by 2002:a1c:7d41:: with SMTP id y62mr14448702wmc.139.1612791492909; Mon, 08 Feb 2021 05:38:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwtxV+C9+SWVwL6VXEnWtsInoVEWIAsYlI5B4HmtwQuM1Med9IZ75/uYsQMXDoQ25gTqLpzoQ== X-Received: by 2002:a1c:7d41:: with SMTP id y62mr14448698wmc.139.1612791492755; Mon, 08 Feb 2021 05:38:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Beraldo Leal , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/18] tests/acceptance/boot_linux: rename misleading cloudinit method Date: Mon, 8 Feb 2021 14:37:04 +0100 Message-Id: <20210208133711.2596075-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cleber Rosa There's no downloading happening on that method, so let's call it "prepare" instead. While at it, and because of it, the current "prepare_boot" and "prepare_cloudinit" are also renamed. The reasoning here is that "prepare_" methods will just work on the images, while "set_up_" will make them effective to the VM that will be launched. Inspiration comes from the "virtiofs_submounts.py" tests, which this expects to converge more into. Signed-off-by: Cleber Rosa Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Beraldo Leal Reviewed-by: Thomas Huth Message-Id: <20210203172357.1422425-3-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/boot_linux.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 2ac3e575874..bcd923bb4a0 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -57,7 +57,7 @@ def download_boot(self): self.cancel('Failed to download/prepare boot image') return boot.path =20 - def download_cloudinit(self, ssh_pubkey=3DNone): + def prepare_cloudinit(self, ssh_pubkey=3DNone): self.log.info('Preparing cloudinit image') try: cloudinit_iso =3D os.path.join(self.workdir, 'cloudinit.iso') @@ -85,15 +85,15 @@ def setUp(self, ssh_pubkey=3DNone): super(BootLinux, self).setUp() self.vm.add_args('-smp', '2') self.vm.add_args('-m', '1024') - self.prepare_boot() - self.prepare_cloudinit(ssh_pubkey) + self.set_up_boot() + self.set_up_cloudinit(ssh_pubkey) =20 - def prepare_boot(self): + def set_up_boot(self): path =3D self.download_boot() self.vm.add_args('-drive', 'file=3D%s' % path) =20 - def prepare_cloudinit(self, ssh_pubkey=3DNone): - cloudinit_iso =3D self.download_cloudinit(ssh_pubkey) + 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): --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791502; cv=none; d=zohomail.com; s=zohoarc; b=Kf/2oEW99y1b0GIK048nsSsbjMsMvAL0Bi2veqD5dcViKHg5O87YzwBb1fofyUjep9TZA/oCguAJ24OmXcIxFxO9uHkozuV9WYtA3HA808TELQhq2uxnhC+ITkJqdy+h5n3cw5iMMEGO2f/7AtiIf/bfScynzaSss6grrjJbZBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791502; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tuEfVjlDp2IXn4e5RcstBTTMJAdpKbTbi45GMwk+iCc=; b=bIIhfUe1IMmp8SjcU7TsM8g7DGyMfd78ZzN1ZJkYfzuMPS9sq9zhOutOlNoE+n3ya7by8mjRakzZBomVl/nR3oKQb50wL7RGHyATT47TT3Qpef224Uev2WLlqpXYYXYTe0uxkDDoja4pfIucPy7NdtLcfeQvprdgrGHLaXWvjgM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791502569205.00125846268065; Mon, 8 Feb 2021 05:38:22 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-343-rNcoY39sOzyjlM2aJQwVQA-1; Mon, 08 Feb 2021 08:38:19 -0500 Received: by mail-wm1-f71.google.com with SMTP id x20so8774225wmc.0 for ; Mon, 08 Feb 2021 05:38:18 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id s6sm21020366wmh.2.2021.02.08.05.38.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791501; 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=tuEfVjlDp2IXn4e5RcstBTTMJAdpKbTbi45GMwk+iCc=; b=ivuFw03YItffiaHwyDDtzGxf5wJT25uw0LfEJxYgxicRfCdGIvrihn6A0yLaqtEGok3H1U LhinqevKbQi7RA1NK8gT1ERRDZSKBbCGC0O0jicYyo+4ry5ivDCWzq6z4n75X1mgO/oeQo pMn+5bq5KTgIX0oHv0fmb5RezySDtX4= X-MC-Unique: rNcoY39sOzyjlM2aJQwVQA-1 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=tuEfVjlDp2IXn4e5RcstBTTMJAdpKbTbi45GMwk+iCc=; b=JnrdvEEr9qATYnXPGL2getd710EPt+M6mv0+qGUqgxlUeQUhnyAMC6fEPyFfZYbVdl RpznzKbP9yan/Zx/IOYQ3x5ci4Y3vcBPYVQkxkMSkCukazo+1X9JUtq89/1bSsp4bSlu jhV/s1583BL+oe7m2/vsX8KBBb6paahNdFnCrBpta9wOMjOLL15wMUxGmpgbnUzVz9rW sKeGCX63/i4GlMDxFJFJ8mJX7sf2OPIfqYsodrHDXo9eTeGUARP81At218q8nb9qpykS vfSmB1oxEGdzNlvM2uZY9pskabQJseDUImesoT68sV0A52zbbLXJ12rUVubIz8jwJ+yh jo9w== X-Gm-Message-State: AOAM533qQ2k1sSDvGEM/NdNDD88h6zNHvcC1mZfQ/hWAqJPEzwtaELJq t4bItF5HjA1p3gu+Er0rExPAJuxKu6R3higQ7z4b75p3bsLyQo7+rnXWKW+/PlU/8kbkOJORZKt H2g+kg4iRMTqj+Q== X-Received: by 2002:a7b:c95a:: with SMTP id i26mr14774958wml.164.1612791498005; Mon, 08 Feb 2021 05:38:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyprMe36auS5d51lc0SNSurbhj+3RjMGg9xVmPRSsZcQLj3ZnmCD97gPd9HIJvP/kNYRpVn7g== X-Received: by 2002:a7b:c95a:: with SMTP id i26mr14774948wml.164.1612791497854; Mon, 08 Feb 2021 05:38:17 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , Beraldo Leal , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 12/18] tests/acceptance/virtiofs_submounts: use workdir property Date: Mon, 8 Feb 2021 14:37:05 +0100 Message-Id: <20210208133711.2596075-13-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cleber Rosa For Avocado Instrumented based tests, it's a better idea to just use the property. The environment variable is a fall back for tests not written using that Python API. Signed-off-by: Cleber Rosa Reviewed-by: Beraldo Leal Reviewed-by: Alex Benn=C3=A9e Reference: https://avocado-framework.readthedocs.io/en/84.0/api/test/avocad= o.html#avocado.Test.workdir Message-Id: <20210203172357.1422425-5-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/virtiofs_submounts.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virt= iofs_submounts.py index 361e5990b65..68d3cd68696 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -136,8 +136,7 @@ def run(self, args, ignore_error=3DFalse): return (stdout, stderr, ret) =20 def set_up_shared_dir(self): - atwd =3D os.getenv('AVOCADO_TEST_WORKDIR') - self.shared_dir =3D os.path.join(atwd, 'virtiofs-shared') + self.shared_dir =3D os.path.join(self.workdir, 'virtiofs-shared') =20 os.mkdir(self.shared_dir) =20 @@ -234,8 +233,7 @@ def setUp(self): =20 self.seed =3D self.params.get('seed') =20 - atwd =3D os.getenv('AVOCADO_TEST_WORKDIR') - self.ssh_key =3D os.path.join(atwd, 'id_ed25519') + self.ssh_key =3D os.path.join(self.workdir, 'id_ed25519') =20 self.run(('ssh-keygen', '-t', 'ed25519', '-f', self.ssh_key)) =20 --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791507; cv=none; d=zohomail.com; s=zohoarc; b=bhOTDLh0urqANaEXWBzWgUxhkLIdsbPHHi1k0aAHqKd0bljdNYop7wG712dm1JpngcDb1UiUE8bsQiEOa9h5cPEFbjQ+e30YYcE8Y+gmcY/N0FL/GHuvnqNwKWQrGab5XhHNevTpgRs5g/O1ogfVkMq4JKGZOc96kTlqEtIb3yA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791507; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=RXPzzUSyI/Ecbth+g0JqoFwcUOJqhlalFuyB188Gi3I=; b=hPDDIs3hLa8zuZZCUWhDQcRUHXTBjWIgdk+fwGR/1IrY03Oqa+SNddQwPI/NL6cg3mySv7UN+kzDpVw8zI1P8Nz7exC0PQA1R6eo5fLqDFMobD2Dyx00PohrG8lvaSnGN/w9H5NI6lQRn5gYoc/FXK/0SFY/Au0qUNab9fgiPXQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612791507850790.7466209141489; Mon, 8 Feb 2021 05:38:27 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-454-sHAiqLy3O4ORtc09uXJAoA-1; Mon, 08 Feb 2021 08:38:24 -0500 Received: by mail-wr1-f72.google.com with SMTP id o17so13120533wrv.4 for ; Mon, 08 Feb 2021 05:38:24 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q15sm1397945wrr.58.2021.02.08.05.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791505; 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=RXPzzUSyI/Ecbth+g0JqoFwcUOJqhlalFuyB188Gi3I=; b=jGy8mscolly+7FX3KG/eVYj2iu/K65YagaCI+Cur0UHp3iWgpXdp88/6n0/AkZNcfco7Pq HiSZK3LAHO+7RPhHkOjLyuZL61Z4EFOa4RKW0cZlHWTYLotY9YR5KQh/qPgHMCaDXhNRou K0ewd3uDXt4hsydOxqpalWxaUdZzVf4= X-MC-Unique: sHAiqLy3O4ORtc09uXJAoA-1 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=RXPzzUSyI/Ecbth+g0JqoFwcUOJqhlalFuyB188Gi3I=; b=b4VpwYZ0oDGOpcgPQ4T9DABuEljftX6jp2YIYogs4k180lJ9y+Dj+arG/rWVLqhUba hfbOfdoJDQPZ7kzfIlWaDPKN33q69VmWA8Ac12mI/PVAhJz1cLOoKZisZK9B6D2oomaA 2CTXKPX+3rI4Frisal78sAUwYt1QPk1JqdUtdCIxcFBgUjWLoVkGlApx90glVPhqpFvE 2gCiVBiGxBXw+SdIOzF6fw1dvTzy5oIPSHEUciN0KpC/2E9BsG5GxhWW1YtwTch0mMop L1zaQvk471o9wUm0zvowhGLgoInDij3xxItHCJ1o0FpvulwXGA3XAtQ3Fsa/X3xX7Tw6 mDYw== X-Gm-Message-State: AOAM530dQUleQ8u3VXmLYsVCrd6x73KxsiBcKnPIdRPne7H1MQvKQhY4 4SP9VIOoV/I/pyYmddnm82Qo4j3WB+Vl2y9zMLABF7aMaCWmfzIu75jRLAl84V7AitMWrLQjdHb c3Ms5qdMqoz7Pbw== X-Received: by 2002:adf:a501:: with SMTP id i1mr6946634wrb.149.1612791503126; Mon, 08 Feb 2021 05:38:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzUHLncLt1yYt0iSWMYbk7Dar0iIlJxeRzdVGcHt3VBy3PjmTK2OzYbf4T3s5XSS3lZxbpiVQ== X-Received: by 2002:adf:a501:: with SMTP id i1mr6946620wrb.149.1612791502910; Mon, 08 Feb 2021 05:38:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , Beraldo Leal , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 13/18] tests/acceptance/virtiofs_submounts: do not ask for ssh key password Date: Mon, 8 Feb 2021 14:37:06 +0100 Message-Id: <20210208133711.2596075-14-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cleber Rosa Tests are supposed to be non-interactive, and ssh-keygen is asking for a passphrase when creating a key. Let's set an empty passphrase to avoid the prompt. Signed-off-by: Cleber Rosa Reviewed-by: Beraldo Leal Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210203172357.1422425-6-crosa@redhat.com> [PMD: Reword description per Alex Benn=C3=A9e comment] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/virtiofs_submounts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virt= iofs_submounts.py index 68d3cd68696..3b5a242385d 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -235,7 +235,7 @@ def setUp(self): =20 self.ssh_key =3D os.path.join(self.workdir, 'id_ed25519') =20 - self.run(('ssh-keygen', '-t', 'ed25519', '-f', self.ssh_key)) + self.run(('ssh-keygen', '-N', '', '-t', 'ed25519', '-f', self.ssh_= key)) =20 pubkey =3D open(self.ssh_key + '.pub').read() =20 --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791512; cv=none; d=zohomail.com; s=zohoarc; b=DUWo5v5NRngcf4SPAlellvTdIFRn/MtGz3gxw4WwvNjpF+IL79QLcEyonFsL4G8BK8XRE+kL0WHOjdgwhJchGRSPyRIm0ISiZVMGtSnmt67r3j7bLWwYIJbMDjc0K3BG0jJU9rhZc9EDccvGHvvyUdmdv2QTDxXoHcLYH5B1Ebg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791512; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=CQL/2c2CKWAyD/s2pXTSLy+Q4WNBTeR2sIKtFalrKUo=; b=TjWQ25vAl3l4v/K74WNKPcSop+jY1Tb3s24EKDfoZx2HEafCs2FqtAlaw8rDmzDaloQH/R+SnzHL09Fk+HTsvOiUhUs9rNKHhiYeM9OhSQaqqtpSiL6Yq2qYApw21SnO2jGShg3AjR3SkgkyPY+ODsFFrc1yoHYovkDbSgldpb0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791512967366.9583819467084; Mon, 8 Feb 2021 05:38:32 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-491-9NKE_wa-OYOCW4zkdAQsfg-1; Mon, 08 Feb 2021 08:38:29 -0500 Received: by mail-wm1-f70.google.com with SMTP id i4so2996328wmb.0 for ; Mon, 08 Feb 2021 05:38:28 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y15sm10506487wrm.93.2021.02.08.05.38.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791512; 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=CQL/2c2CKWAyD/s2pXTSLy+Q4WNBTeR2sIKtFalrKUo=; b=ESTEb4PSCCd3HFmstiVyC92NujObbLutUvH62mNgl3aVCFKVa+WsxHPlmtB9Dot2v5pJ1L Svs8r4w7oTOjRZ8DB0zbO7ob9NxldjWH7lniaVAnd58KHmdlK85HXrecRzWAlgp6lP5NMB y+ngLawk42R/AijQjtlzdF0GQmtdSA8= X-MC-Unique: 9NKE_wa-OYOCW4zkdAQsfg-1 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=CQL/2c2CKWAyD/s2pXTSLy+Q4WNBTeR2sIKtFalrKUo=; b=PsdqXuCgu6RyF9pUvfRhetUcNs6MtsSOWxuoTx8OwnfLKP/VctxswI3cvAlvFF4FOg /ZOG8c8x3WuSSej4lH2GmDhrD7Dv9RxBkXMsGzQpCXXxvA98Ge4oa+BLT7y8ysCtm2KA SODt4WNeHax+3fDjQrv5yM8yWMRoelgCxoAd//OkIV4RL+TYKMSgbm16dEiHKIg/F5xd sLYLuS0zQscMs5Xfk1WQIgpnDzJr4q3+tr9X5SW8wPI+htYXFYlKNaHkAxKzRx/VIJcf 0dWgdeP+iaVLLffk0BsV/otAIU8IQ557bpeCnckVON8JAoLVtL8SoHbfpjUt3WPTZepf /E2w== X-Gm-Message-State: AOAM531UsjaeLHIXS03Nwum9TLPFroeN46Xb5pZ05c0sxcEHUbj8HTIG k/YyhPfBy12xL24MqGgvhvYVzoGdmCj1HqF0uVhdF+NNjXpZ9NbnVfaLHEnumCC0MQpGClsTmgQ 7z1XgiOlOPkc+Iw== X-Received: by 2002:a7b:ce0b:: with SMTP id m11mr4136215wmc.177.1612791507979; Mon, 08 Feb 2021 05:38:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwTDtXpsNBUx9z9cGeHfRQGEjvwgdYuZ5tiqPIbdO9WK/ikbnD1jzK0LqBDHkCQe2E6MBSg1Q== X-Received: by 2002:a7b:ce0b:: with SMTP id m11mr4136200wmc.177.1612791507763; Mon, 08 Feb 2021 05:38:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 14/18] tests/acceptance/virtiofs_submounts: use a virtio-net device instead Date: Mon, 8 Feb 2021 14:37:07 +0100 Message-Id: <20210208133711.2596075-15-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cleber Rosa In a virtiofs based tests, it seems safe to assume that the guest will be capable of a virtio-net device. Signed-off-by: Cleber Rosa Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210203172357.1422425-7-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/virtiofs_submounts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virt= iofs_submounts.py index 3b5a242385d..f1b49f03bb5 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -247,7 +247,7 @@ def setUp(self): =20 # Allow us to connect to SSH self.vm.add_args('-netdev', 'user,id=3Dvnet,hostfwd=3D:127.0.0.1:0= -:22', - '-device', 'e1000,netdev=3Dvnet') + '-device', 'virtio-net,netdev=3Dvnet') =20 if not kvm_available(self.arch, self.qemu_bin): self.cancel(KVM_NOT_AVAILABLE) --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791516; cv=none; d=zohomail.com; s=zohoarc; b=Q0TnQrjSkT/pRLmF+BIjZbx+6L6vrYUcEnPn0AXfujry6t/DaEwXRxJCe5LmQgMl7OvxpXXmMTJ/lX7bSc/5zEC1b62dlcGsM4XYx8hra7M/vgA1fORZ05OPez4sjGY9ixzPEiGbwjoJoddGQSjke7YQTDMKCaY/YuQ1Kb9ejbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791516; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=e0LNi1evvMz34L4iMgJD557S0z2qV5j+B5CpuhtMhXo=; b=H0NFau6FGZyOacF0A53KV8wUR2UL5lJbFsHf9mmCGNHddmG3i/xpFwIomod5tuvYIP34KwAIL1YEbn5TXGrTmPz70K5GAqTCU+T8qbXhz2h6aqLXMIVzCgxHSI8Ha6ZnBoReiRreQfffpqIopgg/kb2oclyS9Gena0V2CXq3OYs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612791516781141.31115445022897; Mon, 8 Feb 2021 05:38:36 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-435-fwdRn1qlOxmnHse6MDQJSA-1; Mon, 08 Feb 2021 08:38:34 -0500 Received: by mail-wr1-f69.google.com with SMTP id x12so13073954wrw.21 for ; Mon, 08 Feb 2021 05:38:34 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o8sm5599250wmc.34.2021.02.08.05.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791515; 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=e0LNi1evvMz34L4iMgJD557S0z2qV5j+B5CpuhtMhXo=; b=MCouFikGM6XdvQ128J2P7E/5a8sSJQ5G1DTm1kVFiJ9dDxOGVhQDL8jZZz3fhvJiWBxpNG 5Qi+gxfs3ZOYjhBoZfkJSMWOLH5oZC7MZfrU3xd2HxKiQMUrU7r+ONjU/QIjBfD+NVoXBS wNbrMdqy++SKWiZ9QEYAf+JA4HCEsA4= X-MC-Unique: fwdRn1qlOxmnHse6MDQJSA-1 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=e0LNi1evvMz34L4iMgJD557S0z2qV5j+B5CpuhtMhXo=; b=km41HxBUfqnvI3OES+VNMlexC2t3/R4U4/d//zmvBa8ckhTGhVzKGq5LdQtCKBLiqI s+46A0EJT+uHZQUH/HiPGpgSf82MEOFo6H/ckm3UYxixbpbCb9VNAp+Xd2jmZfjid3h0 YeS4RR/Ts9xo4Zct+En1Qc6hzQ6wubyUEwUbjCUhrT/XDcWsyxp4oJsvq7jeMJGbQPKI ceP5Ro1A7Ig7kmMjUadeudx8PbRRwZTKlD9yPkBzmi6mwtNcHLXxTQDQSRFLIL1iP7+F XU2sClukzW/cNgFylw7BYt4iK9SLk8T4LxJUJKeT4RDlIWvqlYIxW3KxGdSshjWgA4I5 eP/g== X-Gm-Message-State: AOAM533sMJkl0+o0/6GG0tD8Xzv7yc8AP0vUe0nJvjlnPxX66FYfZNoP +2eCN8BH/qmDsWrrskXywE5fXsm6FODEYeeTzPExwDXP8oBdiW2pdcdDCcBV1LVKZAu4LjnEeZm JPM0xBGRZrB2Daw== X-Received: by 2002:a1c:4b05:: with SMTP id y5mr14573472wma.37.1612791512957; Mon, 08 Feb 2021 05:38:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJx5iKiM22YAdVC/hJMVw1MEO1jya+6pJoJpy40grYv/iNAs1eQg/dU0R13WaodxT93ngiziDg== X-Received: by 2002:a1c:4b05:: with SMTP id y5mr14573456wma.37.1612791512775; Mon, 08 Feb 2021 05:38:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 15/18] tests/acceptance/virtiofs_submounts: standardize port as integer Date: Mon, 8 Feb 2021 14:37:08 +0100 Message-Id: <20210208133711.2596075-16-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cleber Rosa Instead of having to cast it whenever it's going to be used, let's standardize it as an integer, which is the data type that will be used most often. Given that the regex will only match digits, it's safe that we'll end up getting a integer, but, it could as well be a zero. Signed-off-by: Cleber Rosa Reviewed-by: Beraldo Leal Message-Id: <20210203172357.1422425-9-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/virtiofs_submounts.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virt= iofs_submounts.py index f1b49f03bb5..82941756086 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -86,17 +86,18 @@ def get_portfwd(self): re.search(r'TCP.HOST_FORWARD.*127\.0\.0\.1\s*(\d+)\s+10\.', line) if match is not None: - port =3D match[1] + port =3D int(match[1]) break =20 self.assertIsNotNone(port) - self.log.debug('sshd listening on port: ' + port) + self.assertGreater(port, 0) + self.log.debug('sshd listening on port: %d', port) return port =20 def ssh_connect(self, username, keyfile): self.ssh_logger =3D logging.getLogger('ssh') port =3D self.get_portfwd() - self.ssh_session =3D ssh.Session('127.0.0.1', port=3Dint(port), + self.ssh_session =3D ssh.Session('127.0.0.1', port=3Dport, user=3Dusername, key=3Dkeyfile) for i in range(10): try: --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791522; cv=none; d=zohomail.com; s=zohoarc; b=fbzVSRiAgbgIRqavrRH3XzqUhjfW+TVCWVo4OnJqdpf1HlI72UKCTxRuezbx8CzRAP0SdnJaJkVIDIzDJ0TBFvNEUyDLxjZYlM35/gtddNYOyX9sdF2ImnmMOT1CPhVrJVrDXvtl/u9ibL9GMFfR0Hqzlwij9TDHEJcN7+AA8GY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791522; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=yw3gvkBrgjyMj54Sdqk1AmWEgyEgeV5A+uFUxt1FnQM=; b=E5d5H/NmC/jFzcePVsVTI2Fak/GHgdNCqo0oFR8GtfCcXx2eJfQgy2yBN4XiF8KM2MBNesPkh4hof3VRMYAYfUspTg5dnvUra9073tBYven/eDtvij5m/htQb3Whz9Gyl5RCjvWXX/wCOQRjcVSHDKW/cEAt3tLO+gosPcMGQXA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612791522070320.2320246964024; Mon, 8 Feb 2021 05:38:42 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-1heSDzy5Mi2SRYyp18TYiA-1; Mon, 08 Feb 2021 08:38:39 -0500 Received: by mail-wr1-f70.google.com with SMTP id h18so13263868wrr.5 for ; Mon, 08 Feb 2021 05:38:39 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id n9sm29776076wrq.41.2021.02.08.05.38.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791521; 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=yw3gvkBrgjyMj54Sdqk1AmWEgyEgeV5A+uFUxt1FnQM=; b=hqf0IQ4oD1eImAW5BE0oPPEagzVtYENgFkLSCzSOgWaLPxhQhdnqQ+3vRfMJpvoyyeGjtY YSNtoKqe+Njvpx3rLhY5kl14pdR5x8/o7bReKcxdbtpR7e+7dtfUd4sgpZaWfIJByAdwOw Gup/J5fEEogBHP7b5UxctZiCm4Btolk= X-MC-Unique: 1heSDzy5Mi2SRYyp18TYiA-1 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=yw3gvkBrgjyMj54Sdqk1AmWEgyEgeV5A+uFUxt1FnQM=; b=gDWlEFf11uWOcBiOEIjIrLuecNnaDMF9UvvDIhxwQR592potgrCzCFQBkJ6LNVC+z9 J4r93d1NfS0KvLI8LqX4Z2gkLJFfh21bx7UU1/zCp+BDIhL1UB+iue49eTGT3StBCpPn IFq3t4Y/TsYx2GVhOnCllY5l5K03CerjSg1eBS7xCunzubdWvD7SolEBDDgHv8XLRkIy Zo/jv3aPXReV7PPvOfiUoKb4I4KlkePA8UzZeuGqMWuS0eXXnM7PvFKZsUvAtjMVBxck sqv3r2EqcvLv/6b4jE0SW9shvg3pjCC9VZXvSV+V3E1ERfnESdhUbsM4o+QO7WdzR+Sx E5MA== X-Gm-Message-State: AOAM531ps88UmB8fNg6/fGo1heLxAUHsm6ec+TnrFiVe31DFHfRkDuqX zGDg27PGhWOqgmb0EK6W3OhltZrF36Rmp9+b6xqB5Gt7PQvkxGxK3glwOz5kQsI3euHg+mpTDap uoK2X/09+racRqQ== X-Received: by 2002:adf:92c4:: with SMTP id 62mr6753494wrn.245.1612791518138; Mon, 08 Feb 2021 05:38:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJypx9lTMA+yRh/WQ1J/409ez2CjUAz+vDr2RnQ/gt78WORrBZtOL7bm80i8jGwjUlPSy4ZDfA== X-Received: by 2002:adf:92c4:: with SMTP id 62mr6753481wrn.245.1612791517998; Mon, 08 Feb 2021 05:38:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 16/18] tests/acceptance/virtiofs_submounts: required space between IP and port Date: Mon, 8 Feb 2021 14:37:09 +0100 Message-Id: <20210208133711.2596075-17-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cleber Rosa AFAICT, there should not be a situation where IP and port do not have at least one whitespace character separating them. This may be true for other '\s*' patterns in the same regex too. Signed-off-by: Cleber Rosa Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210203172357.1422425-10-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/virtiofs_submounts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virt= iofs_submounts.py index 82941756086..28b2920b88c 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -83,7 +83,7 @@ def get_portfwd(self): command_line=3D'info usernet') for line in res.split('\r\n'): match =3D \ - re.search(r'TCP.HOST_FORWARD.*127\.0\.0\.1\s*(\d+)\s+10\.', + re.search(r'TCP.HOST_FORWARD.*127\.0\.0\.1\s+(\d+)\s+10\.', line) if match is not None: port =3D int(match[1]) --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612792023; cv=none; d=zohomail.com; s=zohoarc; b=gmcbXNJFYdU72eYdcA9zasG/IWzbz5LWLlGfFHPdCmReSGRVw0BNBKjCc0WZ91XNoNWnaphideWGkWn8mezp4bfsOrTgG5NHvroSJ4ARLr7J5yMA2xBFR5n91iyvZ6PgzjtAc5djLPLuve0gydWiEYSZG5cOp2uLR5wWEQSp/po= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612792023; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/uhvvdTSUQUanKk+3tC2Iv10zy7/SZ0MLhsS7OrR6w0=; b=cUEZprOXs/toGd8Rne+JoOqYc6jIXLJwWZOlcpf/B50nwSpnuEQ/Td0h/mZ0bBedzLUr++FTlMb1n9xVjkGFQ9V5fh8N7Jgayh9NCsBMvDE4mxQriMoSZD2A97zx/1cgdSmIwjr0jZ6cYIkUwB3kTcLUd05f7qMRSBHj44OXJ6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612792023961805.8504908595274; Mon, 8 Feb 2021 05:47:03 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-378-NvLHeiQgPJeNlJhEIstQWQ-1; Mon, 08 Feb 2021 08:47:01 -0500 Received: by mail-wr1-f72.google.com with SMTP id m7so13287606wro.12 for ; Mon, 08 Feb 2021 05:47:01 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id b138sm20363007wmb.35.2021.02.08.05.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612792022; 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=/uhvvdTSUQUanKk+3tC2Iv10zy7/SZ0MLhsS7OrR6w0=; b=YBDwiJ7oTMGXAZdUQKJSIyUkUiBe21BKGoLO8leGljWdQyzdR05mLqgZDJpgohapD177Sf /rCT/niDnXY0PwqG7C2snbteldMOe5gBZPjmn8I6p2IKrTihVlNe65FvwfO8JMDAdXiDXd Bn68gwHrXT3TscJXWomjLOFuhWgLNXs= X-MC-Unique: NvLHeiQgPJeNlJhEIstQWQ-1 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=/uhvvdTSUQUanKk+3tC2Iv10zy7/SZ0MLhsS7OrR6w0=; b=PBEI4NZUC2dTbclcv/AD6ccNhQbgeGPcX3/YHBVFsDnrXjQ3fHo+kan8px/ZaRhWpR LPtGtoUTzyKJ0foilxji0OPJvdyzkca21rzyMBwFx2m8PKteWzQnxhGIkSRifrziU0iJ dsbKAetzL2R7rF/Xco7YF1OR6aiUMu/iaIOJ/wXBv3TRbWf7LxaEraHR84wss9r1D8qV mBxzwSCruOTgBEy6fE5LZTu5EzvZvykY9DTOISPCGlp8HFpCLCgdp/Q/Mk3lXY/CBcJO lGs4S/H0mBLTLjNOvhf1XeBURH6YkwkrAoPZR3PmtcImqHYLRGmxRtXjSR8lwKtZYei1 hP5g== X-Gm-Message-State: AOAM530S0pbq5DJno48dpY7yO6qqhJ+8XenEU7O5gchjcx0cZGjF2wax 6e3MFnczCeTCm1n/0ALO18WgRCoPKkTzW9tEfPv8FOH2LaLQph4dbcaYJ4Qfkclha1EVo2kbvBW vLl5EHYGndtM59Q== X-Received: by 2002:a05:600c:4c11:: with SMTP id d17mr2666093wmp.86.1612791540224; Mon, 08 Feb 2021 05:39:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJtoxxRNnaX3EsGkbz+enbj41Dhb9d4oQAbUBT4VIYPLlvBBhM/waH+2JlVeWfbdfVTpoIEw== X-Received: by 2002:a05:600c:4c11:: with SMTP id d17mr2665330wmp.86.1612791524520; Mon, 08 Feb 2021 05:38:44 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Subject: [PULL 17/18] Acceptance tests: clarify ssh connection failure reason Date: Mon, 8 Feb 2021 14:37:10 +0100 Message-Id: <20210208133711.2596075-18-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cleber Rosa If the connection to the ssh server fails, it may indeed be a "sshd" issue, but it may also not be that. Let's state what we know: the establishment of the connection from the client side was not possible. Signed-off-by: Cleber Rosa Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210203172357.1422425-13-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/linux_ssh_mips_malta.py | 2 +- tests/acceptance/virtiofs_submounts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/li= nux_ssh_mips_malta.py index 25c5c5f7411..6dbd02d49d5 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -91,7 +91,7 @@ def ssh_connect(self, username, password): except: time.sleep(4) pass - self.fail("sshd timeout") + self.fail("ssh connection timeout") =20 def ssh_disconnect_vm(self): self.ssh_session.quit() diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virt= iofs_submounts.py index 28b2920b88c..949ca87a837 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -106,7 +106,7 @@ def ssh_connect(self, username, keyfile): except: time.sleep(4) pass - self.fail('sshd timeout') + self.fail('ssh connection timeout') =20 def ssh_command(self, command): self.ssh_logger.info(command) --=20 2.26.2 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612791537; cv=none; d=zohomail.com; s=zohoarc; b=hQh7M0rR8dhqYknos/XAD41KxY740vAgn4Um1nvA5gWsjnaJkpP48mWjMBoWG/K9pgK2tgxxBxIbDadOX2tMDV12QZfDvE6qkSUWZdCFLqHGuloS55OAd+8gA7d3ap1UnW2vkKjY3EUhyXApd2wkNHOILBlwVYVRfNppf8auF2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612791537; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=VBLzi63miNCcD2Mkc748tKr3FnYtOvYC+AmDEFCN934=; b=baCSfihwQxRsqSy16PMrqeUqWGuvaNKsy4oVSbC6XYmeHYuCFxfGlL9MeHWgoqWm2sKx3rj/6LDeLvItu2hSHXy7h7zht94zDekYPQlY85ViW8geZktxXo6EOmo2vqMyKmkZTGIEmIDNy4YooqoqtEDkrmILEt+RjfWFn/SeCxE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612791537786515.7355502930113; Mon, 8 Feb 2021 05:38:57 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-52-mNgH8C_jPsq2Q3sRQWe6MQ-1; Mon, 08 Feb 2021 08:38:54 -0500 Received: by mail-wr1-f70.google.com with SMTP id x12so13074640wrw.21 for ; Mon, 08 Feb 2021 05:38:53 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q6sm27380627wrw.43.2021.02.08.05.38.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791535; 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=VBLzi63miNCcD2Mkc748tKr3FnYtOvYC+AmDEFCN934=; b=TnbIJmVmqryOi06pj9OCkLrTXS8i7a6/nEhTtmIS2ofhf/Xyw4oRR2ovABRFcvchgu1NmE S0SSeQgQ52CtuGzcvHr0ygBE0yRLgTlUOcw115+n/xf7aM1f/3VpkFwI4sBsUtFIrK1PsX Gk9SoMFwOIvt8bTTDoYxhx3yqKXpXWg= X-MC-Unique: mNgH8C_jPsq2Q3sRQWe6MQ-1 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=VBLzi63miNCcD2Mkc748tKr3FnYtOvYC+AmDEFCN934=; b=tm5Vb52cW9q5uPquKHMDQa3YCW1SFEmSgUnbpZUqpZKdC3SFm2K28AR3q2033fU38p PIRKihtOgs/lMl0o5ZpnDUaoAbRxgmUK6EeNnKAnqrBh4Ven9SwsmAkJuLi85djm5zfX VUWupUH6+DvzwA3aO7+h01OCq7JRIfqZOGFy9Iwc05Gc3Op43WgIRWi5loB1IPCqsjrf R9Pb+qCoRcpsguQZdApjybt4zzUi9AFPylf810lsh5OoN4/Zn2Dgi+Gg50tnUsQjI02b fmBgCJnAUSyi2ueag7ZhD8gn7nJGINMniMrTy7ALgeJ90MfmUgWVN+BsxifelwuCJ1Tt XSyg== X-Gm-Message-State: AOAM5339bUFUHakj45ro0Yu6dfKuJds++xNwM+Po2EknKKIZ6T9soFxA brJa6IeYpu/mc1mOIiq+2uwx75ksAuLGIOF6UQDdC/QJEUqch+zV1mBVAqlpjS2nCQ3NtA8iQCM XbbD5ylxVSm/72w== X-Received: by 2002:a5d:5304:: with SMTP id e4mr19823313wrv.167.1612791532806; Mon, 08 Feb 2021 05:38:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwf3hbNit+daoCM+szEaCjleQcKWSchip43GakEK2hqj+TFsGFa/PwMCC860B+wLiBxm2xzgg== X-Received: by 2002:a5d:5304:: with SMTP id e4mr19823297wrv.167.1612791532671; Mon, 08 Feb 2021 05:38:52 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 18/18] Acceptance Tests: remove unnecessary tag from documentation example Date: Mon, 8 Feb 2021 14:37:11 +0100 Message-Id: <20210208133711.2596075-19-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cleber Rosa The ":avocado: enable" is not necessary and was removed in 9531d26c, so let's remove from the docs. Signed-off-by: Cleber Rosa Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210203172357.1422425-4-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/testing.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 809af697255..209f9d8172f 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -765,9 +765,6 @@ and hypothetical example follows: =20 =20 class MultipleMachines(Test): - """ - :avocado: enable - """ def test_multiple_machines(self): first_machine =3D self.get_vm() second_machine =3D self.get_vm() --=20 2.26.2