qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com,
	qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com,
	den@openvz.org
Subject: [PATCH v2 4/5] iotests.py: filter_testfiles(): filter SOCK_DIR too
Date: Wed,  1 Jul 2020 13:53:30 +0300	[thread overview]
Message-ID: <20200701105331.121670-5-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20200701105331.121670-1-vsementsov@virtuozzo.com>

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 tests/qemu-iotests/iotests.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index ac9d199a1e..31d4b105ca 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -345,8 +345,9 @@ def filter_qmp(qmsg, filter_fn):
     return qmsg
 
 def filter_testfiles(msg):
-    prefix = os.path.join(test_dir, "%s-" % (os.getpid()))
-    return msg.replace(prefix, 'TEST_DIR/PID-')
+    pref1 = os.path.join(test_dir, "%s-" % (os.getpid()))
+    pref2 = os.path.join(sock_dir, "%s-" % (os.getpid()))
+    return msg.replace(pref1, 'TEST_DIR/PID-').replace(pref2, 'SOCK_DIR/PID-')
 
 def filter_qmp_testfiles(qmsg):
     def _filter(_key, value):
-- 
2.18.0



  parent reply	other threads:[~2020-07-01 10:57 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-01 10:53 [PATCH v2 0/5] Fix crash due to NBD export leak Vladimir Sementsov-Ogievskiy
2020-07-01 10:53 ` [PATCH v2 1/5] iotests: QemuIoInteractive: use qemu_io_args_no_fmt Vladimir Sementsov-Ogievskiy
2020-07-01 10:53 ` [PATCH v2 2/5] iotests.py: QemuIoInteractive: print output on failure Vladimir Sementsov-Ogievskiy
2020-07-01 10:53 ` [PATCH v2 3/5] nbd: make nbd_export_close_all() synchronous Vladimir Sementsov-Ogievskiy
2020-07-13 13:03   ` Eric Blake
2020-07-01 10:53 ` Vladimir Sementsov-Ogievskiy [this message]
2020-07-13 13:07   ` [PATCH v2 4/5] iotests.py: filter_testfiles(): filter SOCK_DIR too Eric Blake
2020-07-13 14:00     ` Eric Blake
2020-07-13 14:31       ` Vladimir Sementsov-Ogievskiy
2020-07-01 10:53 ` [PATCH v2 5/5] iotests: test shutdown when bitmap is exported through NBD Vladimir Sementsov-Ogievskiy
2020-07-13 13:41   ` Eric Blake

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=20200701105331.121670-5-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=den@openvz.org \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --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 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).