From nobody Fri May 9 23:11:17 2025
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=1734520611; cv=none;
d=zohomail.com; s=zohoarc;
b=HEgh1LIOGHx4VC50DbJTSc3eS4FdAnOgvnssv6QwRET5dKPQBD+YpyErB7KvoyWZfCSy5CwNIELoDlsFGKuLoeuIiE5SzUqsHTfZaujab8Y4lfA2kUB1frQF8NWqVkm/HXSumlQwBVPnGxyl0DYjCLi9ZLn+ooJCob+AcHvGAYk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1734520611;
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=RJAWklKih24xijrZ29wgrNKiDxRq+00Sr6cGaAp+rHc=;
b=bLOgGM5oBhgHIwmuggBHt7JspS8/an0lNDUvjxF7mygEbhtVTxvUWVWxXiTMfTJ6KuVO2eMac1xZ0GnfBbsjKVeZXVqxYu/7ko9gfzvAg90J0f6YckuM4unS3DMx+jvte0HOsPD8oNyZL1Bst0imQS4i5REx23KtGlFkBb+4Jl0=
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=<thuth@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1734520611294112.34114711812447;
Wed, 18 Dec 2024 03:16:51 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tNrwu-0006V3-08; Wed, 18 Dec 2024 06:10:40 -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 <thuth@redhat.com>) id 1tNrws-0006Uu-LR
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 06:10:38 -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 <thuth@redhat.com>) id 1tNrwl-0005J5-DM
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 06:10:38 -0500
Received: from mx-prod-mc-01.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-507-VJQwLk4SNEicSykjlRg96w-1; Wed,
18 Dec 2024 06:10:29 -0500
Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40])
(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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id AB0791955F3B
for <qemu-devel@nongnu.org>; Wed, 18 Dec 2024 11:10:28 +0000 (UTC)
Received: from thuth-p1g4.redhat.com (unknown [10.39.192.114])
by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id B5ADD195605F; Wed, 18 Dec 2024 11:10:26 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1734520230;
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=RJAWklKih24xijrZ29wgrNKiDxRq+00Sr6cGaAp+rHc=;
b=Me9PrObksSLBzgMTHDYltSszDIcBxUjm5MN4GOnjLDi0Nm9BFPAFg0VjGBzNFA6XqsHvxM
x9TvWzN/Z761hXSox8XUOfpGpTpkn9OSCcpk2dRd5ksYkHw0mN1H1HXcYURmTTDezQwUpc
ySWXhCWRz1+zE1oXMHPRmj4w0T8Fwwc=
X-MC-Unique: VJQwLk4SNEicSykjlRg96w-1
X-Mimecast-MFC-AGG-ID: VJQwLk4SNEicSykjlRg96w
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PULL 11/38] tests/functional: switch over to using
self.log_file(...)
Date: Wed, 18 Dec 2024 12:09:31 +0100
Message-ID: <20241218110958.226932-12-thuth@redhat.com>
In-Reply-To: <20241218110958.226932-1-thuth@redhat.com>
References: <20241218110958.226932-1-thuth@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.40
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=thuth@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -31
X-Spam_score: -3.2
X-Spam_bar: ---
X-Spam_report: (-3.2 / 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=-1.116,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
RCVD_IN_VALIDITY_RPBL_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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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: 1734520611938116600
From: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
This removes direct access of the 'self.logdir' variable.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Message-ID: <20241217155953.3950506-12-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/qemu_test/testcase.py | 9 ++++-----
tests/functional/test_virtio_gpu.py | 4 +---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu=
_test/testcase.py
index 89425b737c..2174fbb155 100644
--- a/tests/functional/qemu_test/testcase.py
+++ b/tests/functional/qemu_test/testcase.py
@@ -126,7 +126,7 @@ def scratch_file(self, *args):
Returns: string representing a file path
'''
def log_file(self, *args):
- return str(Path(self.logdir, *args))
+ return str(Path(self.outputdir, *args))
=20
def setUp(self, bin_prefix):
self.assertIsNotNone(self.qemu_bin, 'QEMU_TEST_QEMU_BINARY must be=
set')
@@ -138,8 +138,7 @@ def setUp(self, bin_prefix):
self.workdir =3D os.path.join(self.outputdir, 'scratch')
os.makedirs(self.workdir, exist_ok=3DTrue)
=20
- self.logdir =3D self.outputdir
- self.log_filename =3D os.path.join(self.logdir, 'base.log')
+ self.log_filename =3D self.log_file('base.log')
self.log =3D logging.getLogger('qemu-test')
self.log.setLevel(logging.DEBUG)
self._log_fh =3D logging.FileHandler(self.log_filename, mode=3D'w')
@@ -215,7 +214,7 @@ def setUp(self):
=20
console_log =3D logging.getLogger('console')
console_log.setLevel(logging.DEBUG)
- self.console_log_name =3D os.path.join(self.logdir, 'console.log')
+ self.console_log_name =3D self.log_file('console.log')
self._console_log_fh =3D logging.FileHandler(self.console_log_name,
mode=3D'w')
self._console_log_fh.setLevel(logging.DEBUG)
@@ -269,7 +268,7 @@ def _new_vm(self, name, *args):
vm =3D QEMUMachine(self.qemu_bin,
name=3Dname,
base_temp_dir=3Dself.workdir,
- log_dir=3Dself.logdir)
+ log_dir=3Dself.log_file())
self.log.debug('QEMUMachine "%s" created', name)
self.log.debug('QEMUMachine "%s" temp_dir: %s', name, vm.temp_dir)
=20
diff --git a/tests/functional/test_virtio_gpu.py b/tests/functional/test_vi=
rtio_gpu.py
index 2d298b1f02..7654421e6b 100755
--- a/tests/functional/test_virtio_gpu.py
+++ b/tests/functional/test_virtio_gpu.py
@@ -100,9 +100,7 @@ def test_vhost_user_vga_virgl(self):
os.set_inheritable(qemu_sock.fileno(), True)
os.set_inheritable(vug_sock.fileno(), True)
=20
- self._vug_log_path =3D os.path.join(
- self.logdir, "vhost-user-gpu.log"
- )
+ self._vug_log_path =3D self.log_file("vhost-user-gpu.log")
self._vug_log_file =3D open(self._vug_log_path, "wb")
self.log.info('Complete vhost-user-gpu.log file can be '
'found at %s', self._vug_log_path)
--=20
2.47.1