[Qemu-devel] [PATCH 7/9] iotests.py: Filter filename in any string value

Max Reitz posted 9 patches 6 years, 9 months ago
There is a newer version of this series
[Qemu-devel] [PATCH 7/9] iotests.py: Filter filename in any string value
Posted by Max Reitz 6 years, 9 months ago
filter_qmp_testfiles() currently filters the filename only for specific
keys.  However, there are more keys that take filenames (such as
block-commit's @top and @base, or ssh's @path), and it does not make
sense to list them all here.  "$TEST_DIR/$PID-" should have enough
entropy not to appear anywhere randomly.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/iotests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 29e4e3306f..b6cb73e108 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -274,7 +274,7 @@ def filter_testfiles(msg):
 
 def filter_qmp_testfiles(qmsg):
     def _filter(key, value):
-        if key == 'filename' or key == 'backing-file':
+        if is_str(value):
             return filter_testfiles(value)
         return value
     return filter_qmp(qmsg, _filter)
-- 
2.20.1


Re: [Qemu-devel] [PATCH 7/9] iotests.py: Filter filename in any string value
Posted by John Snow 6 years, 9 months ago

On 1/23/19 9:46 AM, Max Reitz wrote:
> filter_qmp_testfiles() currently filters the filename only for specific
> keys.  However, there are more keys that take filenames (such as
> block-commit's @top and @base, or ssh's @path), and it does not make
> sense to list them all here.  "$TEST_DIR/$PID-" should have enough
> entropy not to appear anywhere randomly.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>

There might be a more aggressive fix we can apply if we don't care about
the keys, but maybe some other filters do still care about the keys.

Ah, either way, this is obviously fine.

Reviewed-by: John Snow <jsnow@redhat.com>

> ---
>  tests/qemu-iotests/iotests.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 29e4e3306f..b6cb73e108 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -274,7 +274,7 @@ def filter_testfiles(msg):
>  
>  def filter_qmp_testfiles(qmsg):
>      def _filter(key, value):
> -        if key == 'filename' or key == 'backing-file':
> +        if is_str(value):
>              return filter_testfiles(value)
>          return value
>      return filter_qmp(qmsg, _filter)
> 

-- 
—js