From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PULL 10/38] tests/functional: add helpers for building file paths
Date: Wed, 18 Dec 2024 12:09:30 +0100 [thread overview]
Message-ID: <20241218110958.226932-11-thuth@redhat.com> (raw)
In-Reply-To: <20241218110958.226932-1-thuth@redhat.com>
From: Daniel P. Berrangé <berrange@redhat.com>
Add helper methods that construct paths for
* log files - to be preserved at the end of a test
* scratch files - to be purged at the end of a test
* build files - anything relative to the build root
* data files - anything relative to the functional test source root
* socket files - a short temporary dir to avoid UNIX socket limits
These are to be used instead of direct access to the self.workdir,
or self.logdir variables, or any other place where paths are built
manually.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20241217155953.3950506-11-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/qemu_test/testcase.py | 95 ++++++++++++++++++++++++++
1 file changed, 95 insertions(+)
diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu_test/testcase.py
index 90ae59eb54..89425b737c 100644
--- a/tests/functional/qemu_test/testcase.py
+++ b/tests/functional/qemu_test/testcase.py
@@ -13,10 +13,12 @@
import logging
import os
+from pathlib import Path
import pycotap
import shutil
import subprocess
import sys
+import tempfile
import unittest
import uuid
@@ -37,9 +39,99 @@ class QemuBaseTest(unittest.TestCase):
log = None
logdir = None
+ '''
+ Create a temporary directory suitable for storing UNIX
+ socket paths.
+
+ Returns: a tempfile.TemporaryDirectory instance
+ '''
+ def socket_dir(self):
+ if self.socketdir is None:
+ self.socketdir = tempfile.TemporaryDirectory(
+ prefix="qemu_func_test_sock_")
+ return self.socketdir
+
+ '''
+ @params args list of zero or more subdirectories or file
+
+ Construct a path for accessing a data file located
+ relative to the source directory that is the root for
+ functional tests.
+
+ @args may be an empty list to reference the root dir
+ itself, may be a single element to reference a file in
+ the root directory, or may be multiple elements to
+ reference a file nested below. The path components
+ will be joined using the platform appropriate path
+ separator.
+
+ Returns: string representing a file path
+ '''
+ def data_file(self, *args):
+ return str(Path(Path(__file__).parent.parent, *args))
+
+ '''
+ @params args list of zero or more subdirectories or file
+
+ Construct a path for accessing a data file located
+ relative to the build directory root.
+
+ @args may be an empty list to reference the build dir
+ itself, may be a single element to reference a file in
+ the build directory, or may be multiple elements to
+ reference a file nested below. The path components
+ will be joined using the platform appropriate path
+ separator.
+
+ Returns: string representing a file path
+ '''
+ def build_file(self, *args):
+ return str(Path(BUILD_DIR, *args))
+
+ '''
+ @params args list of zero or more subdirectories or file
+
+ Construct a path for accessing/creating a scratch file
+ located relative to a temporary directory dedicated to
+ this test case. The directory and its contents will be
+ purged upon completion of the test.
+
+ @args may be an empty list to reference the scratch dir
+ itself, may be a single element to reference a file in
+ the scratch directory, or may be multiple elements to
+ reference a file nested below. The path components
+ will be joined using the platform appropriate path
+ separator.
+
+ Returns: string representing a file path
+ '''
+ def scratch_file(self, *args):
+ return str(Path(self.workdir, *args))
+
+ '''
+ @params args list of zero or more subdirectories or file
+
+ Construct a path for accessing/creating a log file
+ located relative to a temporary directory dedicated to
+ this test case. The directory and its log files will be
+ preserved upon completion of the test.
+
+ @args may be an empty list to reference the log dir
+ itself, may be a single element to reference a file in
+ the log directory, or may be multiple elements to
+ reference a file nested below. The path components
+ will be joined using the platform appropriate path
+ separator.
+
+ Returns: string representing a file path
+ '''
+ def log_file(self, *args):
+ return str(Path(self.logdir, *args))
+
def setUp(self, bin_prefix):
self.assertIsNotNone(self.qemu_bin, 'QEMU_TEST_QEMU_BINARY must be set')
self.arch = self.qemu_bin.split('-')[-1]
+ self.socketdir = None
self.outputdir = os.path.join(BUILD_DIR, 'tests', 'functional',
self.arch, self.id())
@@ -65,6 +157,9 @@ def setUp(self, bin_prefix):
def tearDown(self):
if "QEMU_TEST_KEEP_SCRATCH" not in os.environ:
shutil.rmtree(self.workdir)
+ if self.socketdir is not None:
+ shutil.rmtree(self.socketdir.name)
+ self.socketdir = None
self.machinelog.removeHandler(self._log_fh)
self.log.removeHandler(self._log_fh)
--
2.47.1
next prev parent reply other threads:[~2024-12-18 11:10 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-18 11:09 [PULL 00/38] Functional test improvements, and disallow libnfs v6 Thomas Huth
2024-12-18 11:09 ` [PULL 01/38] tests/functional: add execute permission to aspeed tests Thomas Huth
2024-12-18 11:09 ` [PULL 02/38] tests/functional: remove many unused imports Thomas Huth
2024-12-18 11:09 ` [PULL 03/38] tests/functional: resolve str(Asset) to cache file path Thomas Huth
2024-12-18 11:09 ` [PULL 04/38] tests/functional: remove duplicated 'which' function impl Thomas Huth
2024-12-18 11:09 ` [PULL 05/38] tests/functional: simplify 'which' implementation Thomas Huth
2024-12-18 11:09 ` [PULL 06/38] tests/functional: drop 'tesseract_available' helper Thomas Huth
2024-12-18 11:09 ` [PULL 07/38] tests/functional: introduce some helpful decorators Thomas Huth
2024-12-18 11:09 ` [PULL 08/38] tests/functional: switch to new test skip decorators Thomas Huth
2024-12-18 11:09 ` [PULL 09/38] tests/functional: drop 'has_cmd' and 'has_cmds' helpers Thomas Huth
2024-12-18 11:09 ` Thomas Huth [this message]
2024-12-18 11:09 ` [PULL 11/38] tests/functional: switch over to using self.log_file(...) Thomas Huth
2024-12-18 11:09 ` [PULL 12/38] tests/functional: switch over to using self.build_file(...) Thomas Huth
2024-12-18 11:09 ` [PULL 13/38] tests/functional: switch over to using self.data_file(...) Thomas Huth
2024-12-18 11:09 ` [PULL 14/38] tests/functional: switch over to using self.scratch_file() Thomas Huth
2024-12-18 11:09 ` [PULL 15/38] tests/functional: remove redundant 'rmtree' call Thomas Huth
2024-12-18 11:09 ` [PULL 16/38] tests/functional: move archive handling into new archive.py file Thomas Huth
2024-12-18 11:09 ` [PULL 17/38] tests/functional: move uncompress handling into new uncompress.py file Thomas Huth
2024-12-18 11:09 ` [PULL 18/38] tests/functional: add common zip_extract helper Thomas Huth
2024-12-18 11:09 ` [PULL 19/38] tests/functional: add common deb_extract helper Thomas Huth
2024-12-18 11:09 ` [PULL 20/38] tests/functional: let cpio_extract accept filenames Thomas Huth
2024-12-18 11:09 ` [PULL 21/38] tests/functional: add a generalized archive_extract Thomas Huth
2024-12-18 11:09 ` [PULL 22/38] tests/functional: add 'archive_extract' to QemuBaseTest Thomas Huth
2024-12-18 11:09 ` [PULL 23/38] tests/functional: convert tests to new archive_extract helper Thomas Huth
2024-12-18 11:09 ` [PULL 24/38] tests/functional: add a generalized uncompress helper Thomas Huth
2024-12-18 11:09 ` [PULL 25/38] tests/functional: add 'uncompress' to QemuBaseTest Thomas Huth
2024-12-18 11:09 ` [PULL 26/38] tests/functional: convert tests to new uncompress helper Thomas Huth
2024-12-18 11:09 ` [PULL 27/38] tests/functional: drop back compat imports from utils.py Thomas Huth
2024-12-18 11:09 ` [PULL 28/38] tests/functional: replace 'run_cmd' with subprocess helpers Thomas Huth
2024-12-18 11:09 ` [PULL 29/38] tests/functional: remove now unused 'run_cmd' helper Thomas Huth
2024-12-18 11:09 ` [PULL 30/38] tests/functional: skip tests if assets are not available Thomas Huth
2024-12-18 11:09 ` [PULL 31/38] tests/functional: ignore errors when caching assets, except for 404 Thomas Huth
2024-12-18 11:09 ` [PULL 32/38] MAINTAINERS: add myself as reviewer for functional test suite Thomas Huth
2024-12-18 11:09 ` [PULL 33/38] tests/functional: Convert the quanta-gsj avocado test Thomas Huth
2024-12-18 11:09 ` [PULL 34/38] tests/functional: Convert the arm virt " Thomas Huth
2024-12-18 11:09 ` [PULL 35/38] tests/functional: Add a helper function for retrieving the hostfwd port Thomas Huth
2024-12-18 11:09 ` [PULL 36/38] tests/functional: Convert the intel_iommu avocado test Thomas Huth
2024-12-18 11:09 ` [PULL 37/38] tests/functional: Convert the hotplug_cpu " Thomas Huth
2024-12-18 11:09 ` [PULL 38/38] meson.build: Disallow libnfs v6 to fix the broken macOS build Thomas Huth
2024-12-19 12:29 ` [PULL 00/38] Functional test improvements, and disallow libnfs v6 Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241218110958.226932-11-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.