qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PULL 02/22] qemu-iotests: Fix FilePaths docstring
Date: Tue, 15 Sep 2020 12:46:07 +0200	[thread overview]
Message-ID: <20200915104627.699552-3-mreitz@redhat.com> (raw)
In-Reply-To: <20200915104627.699552-1-mreitz@redhat.com>

From: Nir Soffer <nirsof@gmail.com>

When this class was extracted from FilePath, the docstring was not
updated for generating multiple files, and the example usage was
referencing unrelated file.

While fixing the docstring, add example for creating sockets, which
should use iotests.sock_dir instead of the default base_dir.

Fixes: de263986b5dc
Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Message-Id: <20200828232152.205833-3-nsoffer@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/iotests.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 36814daf84..bbe63a6da0 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -450,14 +450,21 @@ def file_pattern(name):
 
 class FilePaths:
     """
-    FilePaths is an auto-generated filename that cleans itself up.
+    Context manager generating multiple file names. The generated files are
+    removed when exiting the context.
 
-    Use this context manager to generate filenames and ensure that the file
-    gets deleted::
+    Example usage:
+
+        with FilePaths(['a.img', 'b.img']) as (img_a, img_b):
+            # Use img_a and img_b here...
+
+        # a.img and b.img are automatically removed here.
+
+    By default images are created in iotests.test_dir. To create sockets use
+    iotests.sock_dir:
+
+       with FilePaths(['a.sock'], base_dir=iotests.sock_dir) as (sock,):
 
-        with FilePaths(['test.img']) as img_path:
-            qemu_img('create', img_path, '1G')
-        # migration_sock_path is automatically deleted
     """
     def __init__(self, names, base_dir=test_dir):
         self.paths = []
-- 
2.26.2



  parent reply	other threads:[~2020-09-15 10:48 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15 10:46 [PULL 00/22] Block patches Max Reitz
2020-09-15 10:46 ` [PULL 01/22] qemu-iotests: Fix FilePaths cleanup Max Reitz
2020-09-15 10:46 ` Max Reitz [this message]
2020-09-15 10:46 ` [PULL 03/22] qemu-iotests: Support varargs syntax in FilePaths Max Reitz
2020-09-15 10:46 ` [PULL 04/22] qemu-iotests: Merge FilePaths and FilePath Max Reitz
2020-09-15 10:46 ` [PULL 05/22] qemu-iotests: Simplify FilePath __init__ Max Reitz
2020-09-15 10:46 ` [PULL 06/22] block/quorum.c: stable children names Max Reitz
2020-09-15 10:46 ` [PULL 07/22] qemu-img: avoid unaligned read requests during convert Max Reitz
2020-09-15 10:46 ` [PULL 08/22] qcow2: Use macros for the L1, refcount and bitmap table entry sizes Max Reitz
2020-09-15 10:46 ` [PULL 09/22] qcow2: Fix removal of list members from BDRVQcow2State.cluster_allocs Max Reitz
2020-09-15 10:46 ` [PULL 10/22] qcow2: Don't check nb_clusters when removing l2meta from the list Max Reitz
2020-09-15 10:46 ` [PULL 11/22] qcow2: Rewrite the documentation of qcow2_alloc_cluster_offset() Max Reitz
2020-09-15 10:46 ` [PULL 12/22] qemu-img: Explicit number replaced by a constant Max Reitz
2020-09-15 10:46 ` [PULL 13/22] iotests: Skip test_stream_parallel in test 030 when doing "make check" Max Reitz
2020-09-15 10:46 ` [PULL 14/22] block/vhdx: Support vhdx image only with 512 bytes logical sector size Max Reitz
2020-09-15 10:46 ` [PULL 15/22] qcow2: Handle QCowL2Meta on error in preallocate_co() Max Reitz
2020-09-15 10:46 ` [PULL 16/22] qcow2: Make qcow2_free_any_clusters() free only one cluster Max Reitz
2020-09-15 10:46 ` [PULL 17/22] qcow2: Return the original error code in qcow2_co_pwrite_zeroes() Max Reitz
2020-09-15 10:46 ` [PULL 18/22] block/rbd: remove runtime_opts Max Reitz
2020-09-15 10:46 ` [PULL 19/22] block/qcow: remove runtime opts Max Reitz
2020-09-15 10:46 ` [PULL 20/22] qcow2: Make preallocate_co() resize the image to the correct size Max Reitz
2020-09-15 10:46 ` [PULL 21/22] qcow2: Convert qcow2_alloc_cluster_offset() into qcow2_alloc_host_offset() Max Reitz
2020-09-15 10:46 ` [PULL 22/22] block/rbd: add 'namespace' to qemu_rbd_strong_runtime_opts[] Max Reitz
2020-09-15 12:04 ` [PULL 00/22] Block patches Peter Maydell

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=20200915104627.699552-3-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).