tests/acceptance: Add a test with the Fedora 31 kernel and initrd
PATCH 1/1 tests/acceptance: Add a test with the Fedora 31 kernel and initrd
This initrd contains a virtio-net and a virtio-gpu kernel module, so we can check that we can set a MAC address for the network device and that we can successfully write some stuff into the emulated framebuffer of the virtio-gpu device.
---
Based-on: [email protected]
tests/acceptance/machine_s390_ccw_virtio.py | 78 +++++++++++++++++++++ 1 file changed, 78 insertions(+)
tests/acceptance/machine_s390_ccw_virtio.py +78 -0
@@ -9,6 +9,8 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. +import re +import tempfile from avocado_qemu import Test from avocado_qemu import exec_command_and_wait_for_pattern
@@ -150,3 +152,79 @@ class S390CCWVirtioMachine(Test): self.vm.command('human-monitor-command', command_line='balloon 128') exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo', 'MemTotal: 115640 kB') + + + def test_s390x_fedora(self): + + """ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/kernel.img') + kernel_hash = 'b93d1efcafcf29c1673a4ce371a1f8b43941cfeb' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + + initrd_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/initrd.img') + initrd_hash = '3de45d411df5624b8d8ef21cd0b44419ab59b12f' + initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + ' audit=0 rd.rescue') + self.vm.add_args('-nographic', + '-smp', '4', + '-m', '512', + '-name', 'Some Guest Name', + '-uuid', '30de4fd9-b4d5-409e-86a5-09b387f70bfa', + '-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line, + '-device', 'virtio-net-pci,mac=02:ca:fe:fa:ce:12', + '-device', 'virtio-rng-ccw', + '-device', 'virtio-gpu-ccw') + self.vm.launch() + self.wait_for_console_pattern('Entering emergency mode') + + # Some tests to see whether the CLI options have been considered: + exec_command_and_wait_for_pattern(self, + 'cat /sys/class/net/enP1p0s0/address', + '02:ca:fe:fa:ce:12') + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'processors : 4') + exec_command_and_wait_for_pattern(self, 'grep MemTotal /proc/meminfo', + 'MemTotal: 499848 kB') + exec_command_and_wait_for_pattern(self, 'grep Name /proc/sysinfo', + 'Extended Name: Some Guest Name') + exec_command_and_wait_for_pattern(self, 'grep UUID /proc/sysinfo', + '30de4fd9-b4d5-409e-86a5-09b387f70bfa') + + # Disable blinking cursor, then write some stuff into the framebuffer + # ("32-bit encoded", the screendump PPM will then only contain 24-bit) + exec_command_and_wait_for_pattern(self, + 'echo -e "\e[?25l" > /dev/tty0', ':/#') + exec_command_and_wait_for_pattern(self, 'for ((i=0;i<500;i++)); do ' + 'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;' + 'done', + ':/#') + exec_command_and_wait_for_pattern(self, + 'dd if=fox.txt of=/dev/fb0 bs=1000 oflag=sync,nocache ; rm fox.txt', + '24+0 records out') + tmpfile = tempfile.NamedTemporaryFile(suffix='.ppm', + prefix='qemu-scrdump-') + self.vm.command('screendump', filename=tmpfile.name) + ppmfile = open(tmpfile.name, "r") + tmpfile.close + line = ppmfile.readline() + self.assertEqual(line, "P6\n") + line = ppmfile.readline() + self.assertEqual(line, "1024 768\n") + line = ppmfile.readline() + self.assertEqual(line, "255\n") + line = ppmfile.readline() + self.assertEqual(line, "The quick fox jumps over a lazy dog\n") + ppmfile.close
Signature · 1 line
2.27.0
Quoted 54 lines · On Wed, 16 Dec 2020 11:57:11 +0100 Thomas Huth <[email protected]> wrote:
This initrd contains a virtio-net and a virtio-gpu kernel module, so we can check that we can set a MAC address for the network device and that we can successfully write some stuff into the emulated framebuffer of the virtio-gpu device.
Signed-off-by Thomas Huth <[email protected]>---
Based-on: [email protected]tests/acceptance/machine_s390_ccw_virtio.py | 78 +++++++++++++++++++++ 1 file changed, 78 insertions(+)tests/acceptance/machine_s390_ccw_virtio.py +27
-0@@ -9,6 +9,8 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. +import re +import tempfile from avocado_qemu import Test from avocado_qemu import exec_command_and_wait_for_pattern@@ -150,3 +152,79 @@ class S390CCWVirtioMachine(Test): self.vm.command('human-monitor-command', command_line='balloon 128') exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo', 'MemTotal: 115640 kB') + + + def test_s390x_fedora(self): + + """ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/kernel.img') + kernel_hash = 'b93d1efcafcf29c1673a4ce371a1f8b43941cfeb' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + + initrd_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/initrd.img') + initrd_hash = '3de45d411df5624b8d8ef21cd0b44419ab59b12f' + initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + ' audit=0 rd.rescue') + self.vm.add_args('-nographic',
tests/acceptance/machine_s390_ccw_virtio.py class S390CCWVirtioMachine(Test): · line 189
Quoted 10 lines
tests/acceptance/machine_s390_ccw_virtio.py +10
-0+ '-smp', '4', + '-m', '512', + '-name', 'Some Guest Name', + '-uuid', '30de4fd9-b4d5-409e-86a5-09b387f70bfa', + '-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line, + '-device', 'virtio-net-pci,mac=02:ca:fe:fa:ce:12', + '-device', 'virtio-rng-ccw', + '-device', 'virtio-gpu-ccw')
Would it make sense to explicitly specify bus ids for the ccw devices? You could check for them below, and it would potentially be more clear *what* actually failed (e.g. handling the mac address vs device detection).
Quoted 31 lines
tests/acceptance/machine_s390_ccw_virtio.py +31
-0+ self.vm.launch() + self.wait_for_console_pattern('Entering emergency mode') + + # Some tests to see whether the CLI options have been considered: + exec_command_and_wait_for_pattern(self, + 'cat /sys/class/net/enP1p0s0/address', + '02:ca:fe:fa:ce:12') + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'processors : 4') + exec_command_and_wait_for_pattern(self, 'grep MemTotal /proc/meminfo', + 'MemTotal: 499848 kB') + exec_command_and_wait_for_pattern(self, 'grep Name /proc/sysinfo', + 'Extended Name: Some Guest Name') + exec_command_and_wait_for_pattern(self, 'grep UUID /proc/sysinfo', + '30de4fd9-b4d5-409e-86a5-09b387f70bfa') + + # Disable blinking cursor, then write some stuff into the framebuffer + # ("32-bit encoded", the screendump PPM will then only contain 24-bit) + exec_command_and_wait_for_pattern(self, + 'echo -e "\e[?25l" > /dev/tty0', ':/#') + exec_command_and_wait_for_pattern(self, 'for ((i=0;i<500;i++)); do ' + 'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;' + 'done', + ':/#') + exec_command_and_wait_for_pattern(self, + 'dd if=fox.txt of=/dev/fb0 bs=1000 oflag=sync,nocache ; rm fox.txt', + '24+0 records out') + tmpfile = tempfile.NamedTemporaryFile(suffix='.ppm', + prefix='qemu-scrdump-') + self.vm.command('screendump', filename=tmpfile.name) + ppmfile = open(tmpfile.name, "r")
tests/acceptance/machine_s390_ccw_virtio.py class S390CCWVirtioMachine(Test): · line 230
Quoted 10 lines
tests/acceptance/machine_s390_ccw_virtio.py +10
-0+ tmpfile.close + line = ppmfile.readline() + self.assertEqual(line, "P6\n") + line = ppmfile.readline() + self.assertEqual(line, "1024 768\n") + line = ppmfile.readline() + self.assertEqual(line, "255\n") + line = ppmfile.readline() + self.assertEqual(line, "The quick fox jumps over a lazy dog\n") + ppmfile.close
I think this sequence needs an explanatory comment :)
Quoted 64 lines · Cornelia Huck
Quoted 61 lines · On Wed, 16 Dec 2020 11:57:11 +0100 Thomas Huth <[email protected]> wrote:
This initrd contains a virtio-net and a virtio-gpu kernel module, so we can check that we can set a MAC address for the network device and that we can successfully write some stuff into the emulated framebuffer of the virtio-gpu device.
Signed-off-by Thomas Huth <[email protected]>---
Based-on: [email protected]tests/acceptance/machine_s390_ccw_virtio.py | 78 +++++++++++++++++++++ 1 file changed, 78 insertions(+)tests/acceptance/machine_s390_ccw_virtio.py +34
-0@@ -9,6 +9,8 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. +import re +import tempfile from avocado_qemu import Test from avocado_qemu import exec_command_and_wait_for_pattern@@ -150,3 +152,79 @@ class S390CCWVirtioMachine(Test): self.vm.command('human-monitor-command', command_line='balloon 128') exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo', 'MemTotal: 115640 kB') + + + def test_s390x_fedora(self): + + """ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/kernel.img') + kernel_hash = 'b93d1efcafcf29c1673a4ce371a1f8b43941cfeb' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + + initrd_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/initrd.img') + initrd_hash = '3de45d411df5624b8d8ef21cd0b44419ab59b12f' + initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + ' audit=0 rd.rescue') + self.vm.add_args('-nographic', + '-smp', '4', + '-m', '512', + '-name', 'Some Guest Name', + '-uuid', '30de4fd9-b4d5-409e-86a5-09b387f70bfa', + '-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line,
Quoted 8 lines
tests/acceptance/machine_s390_ccw_virtio.py class S390CCWVirtioMachine(Test): · line 189
Quoted 3 lines
tests/acceptance/machine_s390_ccw_virtio.py +3
-0+ '-device', 'virtio-net-pci,mac=02:ca:fe:fa:ce:12', + '-device', 'virtio-rng-ccw', + '-device', 'virtio-gpu-ccw')Would it make sense to explicitly specify bus ids for the ccw devices? You could check for them below, and it would potentially be more clear *what* actually failed (e.g. handling the mac address vs device detection).
Do you mean PCI or CCW bus ids? The MAC address is only used for a PCI device here... but sure, I can add some addresses if you like.
Quoted 35 lines
Quoted 35 lines
tests/acceptance/machine_s390_ccw_virtio.py +35
-0+ self.vm.launch() + self.wait_for_console_pattern('Entering emergency mode') + + # Some tests to see whether the CLI options have been considered: + exec_command_and_wait_for_pattern(self, + 'cat /sys/class/net/enP1p0s0/address', + '02:ca:fe:fa:ce:12') + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'processors : 4') + exec_command_and_wait_for_pattern(self, 'grep MemTotal /proc/meminfo', + 'MemTotal: 499848 kB') + exec_command_and_wait_for_pattern(self, 'grep Name /proc/sysinfo', + 'Extended Name: Some Guest Name') + exec_command_and_wait_for_pattern(self, 'grep UUID /proc/sysinfo', + '30de4fd9-b4d5-409e-86a5-09b387f70bfa') + + # Disable blinking cursor, then write some stuff into the framebuffer + # ("32-bit encoded", the screendump PPM will then only contain 24-bit) + exec_command_and_wait_for_pattern(self, + 'echo -e "\e[?25l" > /dev/tty0', ':/#') + exec_command_and_wait_for_pattern(self, 'for ((i=0;i<500;i++)); do ' + 'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;' + 'done', + ':/#') + exec_command_and_wait_for_pattern(self, + 'dd if=fox.txt of=/dev/fb0 bs=1000 oflag=sync,nocache ; rm fox.txt', + '24+0 records out') + tmpfile = tempfile.NamedTemporaryFile(suffix='.ppm', + prefix='qemu-scrdump-') + self.vm.command('screendump', filename=tmpfile.name) + ppmfile = open(tmpfile.name, "r") + tmpfile.close + line = ppmfile.readline() + self.assertEqual(line, "P6\n") + line = ppmfile.readline()
Quoted 8 lines
tests/acceptance/machine_s390_ccw_virtio.py class S390CCWVirtioMachine(Test): · line 230
Quoted 6 lines
tests/acceptance/machine_s390_ccw_virtio.py +6
-0+ self.assertEqual(line, "1024 768\n") + line = ppmfile.readline() + self.assertEqual(line, "255\n") + line = ppmfile.readline() + self.assertEqual(line, "The quick fox jumps over a lazy dog\n") + ppmfile.closeI think this sequence needs an explanatory comment :)
See my other mail :-)
Thomas
Quoted 74 lines · On Wed, 16 Dec 2020 12:36:13 +0100 Thomas Huth <[email protected]> wrote:
Quoted 64 lines · Cornelia Huck
Quoted 61 lines · On Wed, 16 Dec 2020 11:57:11 +0100 Thomas Huth <[email protected]> wrote:
This initrd contains a virtio-net and a virtio-gpu kernel module, so we can check that we can set a MAC address for the network device and that we can successfully write some stuff into the emulated framebuffer of the virtio-gpu device.
Signed-off-by Thomas Huth <[email protected]>---
Based-on: [email protected]tests/acceptance/machine_s390_ccw_virtio.py | 78 +++++++++++++++++++++ 1 file changed, 78 insertions(+)tests/acceptance/machine_s390_ccw_virtio.py +34
-0@@ -9,6 +9,8 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. +import re +import tempfile from avocado_qemu import Test from avocado_qemu import exec_command_and_wait_for_pattern@@ -150,3 +152,79 @@ class S390CCWVirtioMachine(Test): self.vm.command('human-monitor-command', command_line='balloon 128') exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo', 'MemTotal: 115640 kB') + + + def test_s390x_fedora(self): + + """ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/kernel.img') + kernel_hash = 'b93d1efcafcf29c1673a4ce371a1f8b43941cfeb' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + + initrd_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/initrd.img') + initrd_hash = '3de45d411df5624b8d8ef21cd0b44419ab59b12f' + initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + ' audit=0 rd.rescue') + self.vm.add_args('-nographic', + '-smp', '4', + '-m', '512', + '-name', 'Some Guest Name', + '-uuid', '30de4fd9-b4d5-409e-86a5-09b387f70bfa', + '-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line,Quoted 8 lines
tests/acceptance/machine_s390_ccw_virtio.py class S390CCWVirtioMachine(Test): · line 189
Quoted 3 lines
tests/acceptance/machine_s390_ccw_virtio.py +3
-0+ '-device', 'virtio-net-pci,mac=02:ca:fe:fa:ce:12', + '-device', 'virtio-rng-ccw', + '-device', 'virtio-gpu-ccw')Would it make sense to explicitly specify bus ids for the ccw devices? You could check for them below, and it would potentially be more clear *what* actually failed (e.g. handling the mac address vs device detection).
Quoted 2 lines
Do you mean PCI or CCW bus ids? The MAC address is only used for a PCI device here... but sure, I can add some addresses if you like.
The PCI device would need a zpci device with an uid instead of the bus id.
Quoted 72 lines · Thomas Huth
This initrd contains a virtio-net and a virtio-gpu kernel module, so we can check that we can set a MAC address for the network device and that we can successfully write some stuff into the emulated framebuffer of the virtio-gpu device.
Signed-off-by Thomas Huth <[email protected]>---
Based-on: [email protected]tests/acceptance/machine_s390_ccw_virtio.py | 78 +++++++++++++++++++++ 1 file changed, 78 insertions(+)tests/acceptance/machine_s390_ccw_virtio.py +45
-0@@ -9,6 +9,8 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. +import re +import tempfile from avocado_qemu import Test from avocado_qemu import exec_command_and_wait_for_pattern@@ -150,3 +152,79 @@ class S390CCWVirtioMachine(Test): self.vm.command('human-monitor-command', command_line='balloon 128') exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo', 'MemTotal: 115640 kB') + + + def test_s390x_fedora(self): + + """ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/kernel.img') + kernel_hash = 'b93d1efcafcf29c1673a4ce371a1f8b43941cfeb' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + + initrd_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/31/Server/s390x/os' + '/images/initrd.img') + initrd_hash = '3de45d411df5624b8d8ef21cd0b44419ab59b12f' + initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + ' audit=0 rd.rescue') + self.vm.add_args('-nographic', + '-smp', '4', + '-m', '512', + '-name', 'Some Guest Name', + '-uuid', '30de4fd9-b4d5-409e-86a5-09b387f70bfa', + '-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line, + '-device', 'virtio-net-pci,mac=02:ca:fe:fa:ce:12', + '-device', 'virtio-rng-ccw', + '-device', 'virtio-gpu-ccw') + self.vm.launch() + self.wait_for_console_pattern('Entering emergency mode') + + # Some tests to see whether the CLI options have been considered: + exec_command_and_wait_for_pattern(self, + 'cat /sys/class/net/enP1p0s0/address', + '02:ca:fe:fa:ce:12') + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',
tests/acceptance/machine_s390_ccw_virtio.py class S390CCWVirtioMachine(Test): · line 207
Quoted 10 lines
tests/acceptance/machine_s390_ccw_virtio.py +10
-0+ 'processors : 4') + exec_command_and_wait_for_pattern(self, 'grep MemTotal /proc/meminfo', + 'MemTotal: 499848 kB') + exec_command_and_wait_for_pattern(self, 'grep Name /proc/sysinfo', + 'Extended Name: Some Guest Name') + exec_command_and_wait_for_pattern(self, 'grep UUID /proc/sysinfo', + '30de4fd9-b4d5-409e-86a5-09b387f70bfa') + + # Disable blinking cursor, then write some stuff into the framebuffer + # ("32-bit encoded", the screendump PPM will then only contain 24-bit)
As just discussed offline with Cornelia, this maybe needs some more explanation, so I'd suggest to add something like:
# Disable blinking cursor, then write some stuff into the
# framebuffer. QEMU's PPM screendumps contain uncompressed # 24-bit values, while the framebuffer uses 32-bit, so we # pad our text with some spaces when writing to the frame- # buffer. Since the PPM is uncompressed, we then can simple # read the written "magic bytes" back from the PPM file to # check whether the framebuffer is working as expected.
Does that sound ok?
Thomas
Quoted 24 lines
tests/acceptance/machine_s390_ccw_virtio.py +23
-0+ exec_command_and_wait_for_pattern(self, + 'echo -e "\e[?25l" > /dev/tty0', ':/#') + exec_command_and_wait_for_pattern(self, 'for ((i=0;i<500;i++)); do ' + 'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;' + 'done', + ':/#') + exec_command_and_wait_for_pattern(self, + 'dd if=fox.txt of=/dev/fb0 bs=1000 oflag=sync,nocache ; rm fox.txt', + '24+0 records out') + tmpfile = tempfile.NamedTemporaryFile(suffix='.ppm', + prefix='qemu-scrdump-') + self.vm.command('screendump', filename=tmpfile.name) + ppmfile = open(tmpfile.name, "r") + tmpfile.close + line = ppmfile.readline() + self.assertEqual(line, "P6\n") + line = ppmfile.readline() + self.assertEqual(line, "1024 768\n") + line = ppmfile.readline() + self.assertEqual(line, "255\n") + line = ppmfile.readline() + self.assertEqual(line, "The quick fox jumps over a lazy dog\n") + ppmfile.close
Quoted 9 lines · On Wed, 16 Dec 2020 12:32:22 +0100 Thomas Huth <[email protected]> wrote:
tests/acceptance/machine_s390_ccw_virtio.py class S390CCWVirtioMachine(Test): · line 207
Quoted 2 lines · Thomas Huth
tests/acceptance/machine_s390_ccw_virtio.py +2
-0+ # Disable blinking cursor, then write some stuff into the framebuffer + # ("32-bit encoded", the screendump PPM will then only contain 24-bit)As just discussed offline with Cornelia, this maybe needs some more explanation, so I'd suggest to add something like:
# Disable blinking cursor, then write some stuff into the
Quoted 8 lines
# framebuffer. QEMU's PPM screendumps contain uncompressed # 24-bit values, while the framebuffer uses 32-bit, so we # pad our text with some spaces when writing to the frame- # buffer. Since the PPM is uncompressed, we then can simple # read the written "magic bytes" back from the PPM file to # check whether the framebuffer is working as expected.Does that sound ok?
Sound good to me.
Quoted 29 lines
Thomas
Quoted 24 lines
tests/acceptance/machine_s390_ccw_virtio.py +23
-0+ exec_command_and_wait_for_pattern(self, + 'echo -e "\e[?25l" > /dev/tty0', ':/#') + exec_command_and_wait_for_pattern(self, 'for ((i=0;i<500;i++)); do ' + 'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;' + 'done', + ':/#') + exec_command_and_wait_for_pattern(self, + 'dd if=fox.txt of=/dev/fb0 bs=1000 oflag=sync,nocache ; rm fox.txt', + '24+0 records out') + tmpfile = tempfile.NamedTemporaryFile(suffix='.ppm', + prefix='qemu-scrdump-') + self.vm.command('screendump', filename=tmpfile.name) + ppmfile = open(tmpfile.name, "r") + tmpfile.close + line = ppmfile.readline() + self.assertEqual(line, "P6\n") + line = ppmfile.readline() + self.assertEqual(line, "1024 768\n") + line = ppmfile.readline() + self.assertEqual(line, "255\n") + line = ppmfile.readline() + self.assertEqual(line, "The quick fox jumps over a lazy dog\n") + ppmfile.close