From nobody Fri Dec 27 01:46:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1732901549; cv=none; d=zohomail.com; s=zohoarc; b=YHNXbF2I0W1VOK8RS9D5W145RV/OaJ6oiEylkf+khcmrH0s18Qe6cJNQDowO39Y2BbfiYjWuoAQ1B4RhnM8Dkx8SX1boQryxlTvhahP+AMfzekwepGPo3pELgxB5moRkhfpQ0ERZjEAyBF05maKSxc7wbAwav/HhPOLlTcWlD8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732901549; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MjGCMqsjW1B5YuxiEfV5ODv2USRNF4jZygU4xmpzmEw=; b=RGz3RZZm1QFiFYmHUhXtoXC2ryw5MKHODTaZBUTmJSH/WBcbOMv4/hLU5H7T7C3JJpFRkoxxAAJ3F/CAstaeFkM2YKNa8zRern6n6bumE1GP/yf8acbDCQD4dNY+OKtM2Pejxw97vw5s13Ji1g0I6cNA9qDknfaLrkgvLT5sYMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17329015496311020.5321461102346; Fri, 29 Nov 2024 09:32:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tH4ql-0003mC-Ib; Fri, 29 Nov 2024 12:32:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tH4qY-0003gq-Hq for qemu-devel@nongnu.org; Fri, 29 Nov 2024 12:32:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tH4qW-0000wL-UD for qemu-devel@nongnu.org; Fri, 29 Nov 2024 12:32:02 -0500 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-Cj5iyRtPO46FzfE8GZEg6w-1; Fri, 29 Nov 2024 12:31:55 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2D4121955DD2; Fri, 29 Nov 2024 17:31:54 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.37]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BF8B71955F41; Fri, 29 Nov 2024 17:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732901520; 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=MjGCMqsjW1B5YuxiEfV5ODv2USRNF4jZygU4xmpzmEw=; b=Kyq8Q33e9Yry7iaYpSEd579ETaOgKs5iV1l+z2NtK3JmUnzjIrTSYAJozo7K32PvlK2uPM gNwDG7yaxPFTzkGWmXpgFDm05AT+tuOb17rrZ4hNAj+XwG6U1YGvbWtMYPAL1tipqxsR8e PpIIrRfDuoGvZ/0Io6RoYRB/Urife88= X-MC-Unique: Cj5iyRtPO46FzfE8GZEg6w-1 X-Mimecast-MFC-AGG-ID: Cj5iyRtPO46FzfE8GZEg6w From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 11/22] tests/functional: switch over to using self.data_file(...) Date: Fri, 29 Nov 2024 17:31:09 +0000 Message-ID: <20241129173120.761728-12-berrange@redhat.com> In-Reply-To: <20241129173120.761728-1-berrange@redhat.com> References: <20241129173120.761728-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.93, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1732901550966019100 This removes direct path manipulation to figure out the source dir Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- tests/functional/test_acpi_bits.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/tests/functional/test_acpi_bits.py b/tests/functional/test_acp= i_bits.py index 4de5fae37e..948b134b16 100755 --- a/tests/functional/test_acpi_bits.py +++ b/tests/functional/test_acpi_bits.py @@ -41,7 +41,6 @@ import tempfile import zipfile =20 -from pathlib import Path from typing import ( List, Optional, @@ -122,7 +121,6 @@ class AcpiBitsTest(QemuBaseTest): #pylint: disable=3Dto= o-many-instance-attributes def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self._vm =3D None - self._baseDir =3D None =20 self._debugcon_addr =3D '0x403' self._debugcon_log =3D 'debugcon-log.txt' @@ -137,26 +135,22 @@ def _print_log(self, log): def copy_bits_config(self): """ copies the bios bits config file into bits. """ - config_file =3D 'bits-cfg.txt' - bits_config_dir =3D os.path.join(self._baseDir, 'acpi-bits', - 'bits-config') + bits_config_file =3D self.data_file('acpi-bits', + 'bits-config', + 'bits-cfg.txt') target_config_dir =3D os.path.join(self.workdir, 'bits-%d' %self.BITS_INTERNAL_VER, 'boot') - self.assertTrue(os.path.exists(bits_config_dir)) + self.assertTrue(os.path.exists(bits_config_file)) self.assertTrue(os.path.exists(target_config_dir)) - self.assertTrue(os.access(os.path.join(bits_config_dir, - config_file), os.R_OK)) - shutil.copy2(os.path.join(bits_config_dir, config_file), - target_config_dir) + shutil.copy2(bits_config_file, target_config_dir) self.logger.info('copied config file %s to %s', - config_file, target_config_dir) + bits_config_file, target_config_dir) =20 def copy_test_scripts(self): """copies the python test scripts into bits. """ =20 - bits_test_dir =3D os.path.join(self._baseDir, 'acpi-bits', - 'bits-tests') + bits_test_dir =3D self.data_file('acpi-bits', 'bits-tests') target_test_dir =3D os.path.join(self.workdir, 'bits-%d' %self.BITS_INTERNAL_VER, 'boot', 'python') @@ -259,8 +253,6 @@ def setUp(self): # pylint: disable=3Darguments-differ super().setUp('qemu-system-') self.logger =3D self.log =20 - self._baseDir =3D Path(__file__).parent - prebuiltDir =3D os.path.join(self.workdir, 'prebuilt') if not os.path.isdir(prebuiltDir): os.mkdir(prebuiltDir, mode=3D0o775) --=20 2.46.0