tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution

[PATCH] tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution

Thomas Huth posted 1 patch 2 years, 2 months ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220221101933.307525-1-thuth@redhat.com

Maintainers: Eric Farman <farman@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Cornelia Huck <cohuck@redhat.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Beraldo Leal <bleal@redhat.com>, Thomas Huth <thuth@redhat.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Cleber Rosa <crosa@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>

tests/avocado/machine_s390_ccw_virtio.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution

Posted by Thomas Huth 2 years, 2 months ago

QEMU's default screen resolution recently changed to 1280x800, so the
resolution in the screen shot header changed of course, too.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Fixes: de72c4b7cd ("edid: set default resolution to 1280x800 (WXGA)")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/avocado/machine_s390_ccw_virtio.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/avocado/machine_s390_ccw_virtio.py b/tests/avocado/machine_s390_ccw_virtio.py
index bd03d7160b..438a6f4321 100644
--- a/tests/avocado/machine_s390_ccw_virtio.py
+++ b/tests/avocado/machine_s390_ccw_virtio.py
@@ -248,7 +248,7 @@ def test_s390x_fedora(self):
             line = ppmfile.readline()
             self.assertEqual(line, b"P6\n")
             line = ppmfile.readline()
-            self.assertEqual(line, b"1024 768\n")
+            self.assertEqual(line, b"1280 800\n")
             line = ppmfile.readline()
             self.assertEqual(line, b"255\n")
             line = ppmfile.readline(256)
-- 
2.27.0

Re: [PATCH] tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution

Posted by Daniel P. Berrangé 2 years, 2 months ago

On Mon, Feb 21, 2022 at 11:19:33AM +0100, Thomas Huth wrote:
> QEMU's default screen resolution recently changed to 1280x800, so the
> resolution in the screen shot header changed of course, too.
> 
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Fixes: de72c4b7cd ("edid: set default resolution to 1280x800 (WXGA)")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/avocado/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/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution

Posted by Halil Pasic 2 years, 2 months ago

On Mon, 21 Feb 2022 11:19:33 +0100
Thomas Huth <thuth@redhat.com> wrote:

> QEMU's default screen resolution recently changed to 1280x800, so the
> resolution in the screen shot header changed of course, too.
> 
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Fixes: de72c4b7cd ("edid: set default resolution to 1280x800 (WXGA)")
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Looks good!

Acked-by: Halil Pasic <pasic@linux.ibm.com>
> ---
>  tests/avocado/machine_s390_ccw_virtio.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/avocado/machine_s390_ccw_virtio.py b/tests/avocado/machine_s390_ccw_virtio.py
> index bd03d7160b..438a6f4321 100644
> --- a/tests/avocado/machine_s390_ccw_virtio.py
> +++ b/tests/avocado/machine_s390_ccw_virtio.py
> @@ -248,7 +248,7 @@ def test_s390x_fedora(self):
>              line = ppmfile.readline()
>              self.assertEqual(line, b"P6\n")
>              line = ppmfile.readline()
> -            self.assertEqual(line, b"1024 768\n")
> +            self.assertEqual(line, b"1280 800\n")
>              line = ppmfile.readline()
>              self.assertEqual(line, b"255\n")
>              line = ppmfile.readline(256)

Re: [PATCH] tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution

Posted by Philippe Mathieu-Daudé 2 years, 2 months ago

On 21/2/22 11:19, Thomas Huth wrote:
> QEMU's default screen resolution recently changed to 1280x800, so the
> resolution in the screen shot header changed of course, too.
> 
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Fixes: de72c4b7cd ("edid: set default resolution to 1280x800 (WXGA)")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/avocado/machine_s390_ccw_virtio.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>