[PATCH] tests/acceptance: bound the size of readline in s390_ccw_virtio

[PATCH] tests/acceptance: bound the size of readline in s390_ccw_virtio

[Alex Bennée]

The read binary data as text via a PPM export of the frame buffer
seems a bit sketchy and it did blow up in the real world when the
assertion failed:

  https://gitlab.com/qemu-project/qemu/-/jobs/943183183

However short of cleaning up the test to be more binary focused at
least limit the attempt to dump the whole file as hexified zeros in
the logs.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/acceptance/machine_s390_ccw_virtio.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py
index 0f81af9950..5141d6abb2 100644
--- a/tests/acceptance/machine_s390_ccw_virtio.py
+++ b/tests/acceptance/machine_s390_ccw_virtio.py
@@ -241,7 +241,7 @@ class S390CCWVirtioMachine(Test):
             self.assertEqual(line, b"1024 768\n")
             line = ppmfile.readline()
             self.assertEqual(line, b"255\n")
-            line = ppmfile.readline()
+            line = ppmfile.readline(size=256)
             self.assertEqual(line, b"The quick fox jumps over a lazy dog\n")
 
         # Hot-plug a virtio-crypto device and see whether it gets accepted
-- 
2.20.1

Re: [PATCH] tests/acceptance: bound the size of readline in s390_ccw_virtio

[Daniel P. Berrangé]

On Tue, Jan 05, 2021 at 12:44:05PM +0000, Alex Bennée wrote:
> The read binary data as text via a PPM export of the frame buffer
> seems a bit sketchy and it did blow up in the real world when the
> assertion failed:
> 
>   https://gitlab.com/qemu-project/qemu/-/jobs/943183183
> 
> However short of cleaning up the test to be more binary focused at
> least limit the attempt to dump the whole file as hexified zeros in
> the logs.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  tests/acceptance/machine_s390_ccw_virtio.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH] tests/acceptance: bound the size of readline in s390_ccw_virtio

[Willian Rampazzo]

On Tue, Jan 5, 2021 at 9:46 AM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The read binary data as text via a PPM export of the frame buffer
> seems a bit sketchy and it did blow up in the real world when the
> assertion failed:
>
>   https://gitlab.com/qemu-project/qemu/-/jobs/943183183
>
> However short of cleaning up the test to be more binary focused at
> least limit the attempt to dump the whole file as hexified zeros in
> the logs.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  tests/acceptance/machine_s390_ccw_virtio.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Reviewed-by: Willian Rampazzo <willianr@redhat.com>

Re: [PATCH] tests/acceptance: bound the size of readline in s390_ccw_virtio

[Halil Pasic]

On Tue,  5 Jan 2021 12:44:05 +0000
Alex Bennée <alex.bennee@linaro.org> wrote:

> The read binary data as text via a PPM export of the frame buffer
> seems a bit sketchy and it did blow up in the real world when the
> assertion failed:
> 
>   https://gitlab.com/qemu-project/qemu/-/jobs/943183183
> 
> However short of cleaning up the test to be more binary focused at
> least limit the attempt to dump the whole file as hexified zeros in
> the logs.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Acked-by: Halil Pasic <pasic@linux.ibm.com>

Thanks!

> ---
>  tests/acceptance/machine_s390_ccw_virtio.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py
> index 0f81af9950..5141d6abb2 100644
> --- a/tests/acceptance/machine_s390_ccw_virtio.py
> +++ b/tests/acceptance/machine_s390_ccw_virtio.py
> @@ -241,7 +241,7 @@ class S390CCWVirtioMachine(Test):
>              self.assertEqual(line, b"1024 768\n")
>              line = ppmfile.readline()
>              self.assertEqual(line, b"255\n")
> -            line = ppmfile.readline()
> +            line = ppmfile.readline(size=256)
>              self.assertEqual(line, b"The quick fox jumps over a lazy dog\n")
>  
>          # Hot-plug a virtio-crypto device and see whether it gets accepted

Re: [PATCH] tests/acceptance: bound the size of readline in s390_ccw_virtio

[Thomas Huth]

On 05/01/2021 13.44, Alex Bennée wrote:
> The read binary data as text via a PPM export of the frame buffer
> seems a bit sketchy and it did blow up in the real world when the
> assertion failed:
> 
>    https://gitlab.com/qemu-project/qemu/-/jobs/943183183
> 
> However short of cleaning up the test to be more binary focused at
> least limit the attempt to dump the whole file as hexified zeros in
> the logs.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/acceptance/machine_s390_ccw_virtio.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py
> index 0f81af9950..5141d6abb2 100644
> --- a/tests/acceptance/machine_s390_ccw_virtio.py
> +++ b/tests/acceptance/machine_s390_ccw_virtio.py
> @@ -241,7 +241,7 @@ class S390CCWVirtioMachine(Test):
>               self.assertEqual(line, b"1024 768\n")
>               line = ppmfile.readline()
>               self.assertEqual(line, b"255\n")
> -            line = ppmfile.readline()
> +            line = ppmfile.readline(size=256)
>               self.assertEqual(line, b"The quick fox jumps over a lazy dog\n")
>   
>           # Hot-plug a virtio-crypto device and see whether it gets accepted
> 

Acked-by: Thomas Huth <thuth@redhat.com>