Re: [PATCH v2 4/5] iotests.py: filter_testfiles(): filter SOCK_DIR too
13.07.2020 17:00, Eric Blake wrote: On 7/13/20 8:07 AM, Eric Blake wrote: On 7/1/20 5:53 AM, Vladimir Sementsov-Ogievskiy wrote: Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/iotests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake Queuing 1, 2, and 4 through my NBD tree as trivial iotest improvements, while we await better review on 3. we aio_wait :) Thanks! 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): -- Best regards, Vladimir
Re: [PATCH v2 4/5] iotests.py: filter_testfiles(): filter SOCK_DIR too
On 7/13/20 8:07 AM, Eric Blake wrote: On 7/1/20 5:53 AM, Vladimir Sementsov-Ogievskiy wrote: Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/iotests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake Queuing 1, 2, and 4 through my NBD tree as trivial iotest improvements, while we await better review on 3. 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): -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 4/5] iotests.py: filter_testfiles(): filter SOCK_DIR too
On 7/1/20 5:53 AM, Vladimir Sementsov-Ogievskiy wrote: Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/iotests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake 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): -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
[PATCH v2 4/5] iotests.py: filter_testfiles(): filter SOCK_DIR too
Signed-off-by: Vladimir Sementsov-Ogievskiy --- 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
