[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/5] iotests.py: filter_testfiles(): filter SOCK_DIR too
From: |
Eric Blake |
Subject: |
[PULL 5/5] iotests.py: filter_testfiles(): filter SOCK_DIR too |
Date: |
Mon, 13 Jul 2020 09:21:06 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200701105331.121670-5-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.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 2a08fea3c9ec..8b760405ee72 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.27.0
- [PULL 0/5] NBD patches for 2020-07-13, Eric Blake, 2020/07/13
- [PULL 1/5] nbd: Avoid off-by-one in long export name truncation, Eric Blake, 2020/07/13
- [PULL 3/5] iotests: QemuIoInteractive: use qemu_io_args_no_fmt, Eric Blake, 2020/07/13
- [PULL 4/5] iotests.py: QemuIoInteractive: print output on failure, Eric Blake, 2020/07/13
- [PULL 5/5] iotests.py: filter_testfiles(): filter SOCK_DIR too,
Eric Blake <=
- [PULL 2/5] hax: Fix setting of FD_CLOEXEC, Eric Blake, 2020/07/13
- Re: [PULL 0/5] NBD patches for 2020-07-13, Peter Maydell, 2020/07/14