]> git.proxmox.com Git - mirror_qemu.git/commitdiff
tests/acceptance: bound the size of readline in s390_ccw_virtio
authorAlex Bennée <alex.bennee@linaro.org>
Tue, 5 Jan 2021 12:44:05 +0000 (12:44 +0000)
committerAlex Bennée <alex.bennee@linaro.org>
Wed, 6 Jan 2021 17:30:02 +0000 (17:30 +0000)
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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Acked-by: Halil Pasic <pasic@linux.ibm.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210105124405.15424-1-alex.bennee@linaro.org>

tests/acceptance/machine_s390_ccw_virtio.py

index 0f81af99506a611a56b05024ea6535804d1a5d1f..eccf26b262adf8cd1e3effd77d2242c77f9cde16 100644 (file)
@@ -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(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