From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PULL 07/15] tests/functional: Move the code for testing HTTP downloads to a common function
Date: Fri, 7 Mar 2025 12:53:06 +0100 [thread overview]
Message-ID: <20250307115314.1096373-8-thuth@redhat.com> (raw)
In-Reply-To: <20250307115314.1096373-1-thuth@redhat.com>
We are going to use this code in other tests, too, so let's move it
to the qemu_test module to be able to re-use it more easily.
Message-ID: <20250227103915.19795-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/qemu_test/linuxkernel.py | 26 ++++++++++++++++++++++-
tests/functional/test_intel_iommu.py | 22 +------------------
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/tests/functional/qemu_test/linuxkernel.py b/tests/functional/qemu_test/linuxkernel.py
index 2c9598102d0..2aca0ee3cd0 100644
--- a/tests/functional/qemu_test/linuxkernel.py
+++ b/tests/functional/qemu_test/linuxkernel.py
@@ -3,8 +3,12 @@
# 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 hashlib
+import urllib.request
+
+from .cmd import wait_for_console_pattern, exec_command_and_wait_for_pattern
from .testcase import QemuSystemTest
-from .cmd import wait_for_console_pattern
+from .utils import get_usernet_hostfwd_port
class LinuxKernelTest(QemuSystemTest):
@@ -26,3 +30,23 @@ def launch_kernel(self, kernel, initrd=None, dtb=None, console_index=0,
self.vm.launch()
if wait_for:
self.wait_for_console_pattern(wait_for)
+
+ def check_http_download(self, filename, hashsum, guestport=8080,
+ pythoncmd='python3 -m http.server'):
+ exec_command_and_wait_for_pattern(self,
+ f'{pythoncmd} {guestport} & sleep 1',
+ f'Serving HTTP on 0.0.0.0 port {guestport}')
+ hl = hashlib.sha256()
+ hostport = get_usernet_hostfwd_port(self.vm)
+ url = f'http://localhost:{hostport}{filename}'
+ self.log.info(f'Downloading {url} ...')
+ with urllib.request.urlopen(url) as response:
+ while True:
+ chunk = response.read(1 << 20)
+ if not chunk:
+ break
+ hl.update(chunk)
+
+ digest = hl.hexdigest()
+ self.log.info(f'sha256sum of download is {digest}.')
+ self.assertEqual(digest, hashsum)
diff --git a/tests/functional/test_intel_iommu.py b/tests/functional/test_intel_iommu.py
index a9e8f82ab59..62268d6f278 100755
--- a/tests/functional/test_intel_iommu.py
+++ b/tests/functional/test_intel_iommu.py
@@ -10,11 +10,7 @@
# 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 hashlib
-import urllib.request
-
from qemu_test import LinuxKernelTest, Asset, exec_command_and_wait_for_pattern
-from qemu_test.utils import get_usernet_hostfwd_port
class IntelIOMMU(LinuxKernelTest):
@@ -125,23 +121,7 @@ def run_and_check(self):
# Check virtio-net via HTTP:
exec_command_and_wait_for_pattern(self, 'dhclient eth0', prompt)
- exec_command_and_wait_for_pattern(self,
- f'python3 -m http.server {self.GUEST_PORT} & sleep 1',
- f'Serving HTTP on 0.0.0.0 port {self.GUEST_PORT}')
- hl = hashlib.sha256()
- hostport = get_usernet_hostfwd_port(self.vm)
- url = f'http://localhost:{hostport}{filename}'
- self.log.info(f'Downloading {url} ...')
- with urllib.request.urlopen(url) as response:
- while True:
- chunk = response.read(1 << 20)
- if not chunk:
- break
- hl.update(chunk)
-
- digest = hl.hexdigest()
- self.log.info(f'sha256sum of download is {digest}.')
- self.assertEqual(digest, hashsum)
+ self.check_http_download(filename, hashsum, self.GUEST_PORT)
def test_intel_iommu(self):
self.common_vm_setup()
--
2.48.1
next prev parent reply other threads:[~2025-03-07 11:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-07 11:52 [PULL 00/15] Functional and s390x patches before 10.0 soft-freeze Thomas Huth
2025-03-07 11:53 ` [PULL 01/15] tests/functional: remove unused 'bin_prefix' variable Thomas Huth
2025-03-07 11:53 ` [PULL 02/15] tests/functional: set 'qemu_bin' as an object level field Thomas Huth
2025-03-07 11:53 ` [PULL 03/15] tests/functional: reduce tuxrun maxmem to work on 32-bit hosts Thomas Huth
2025-03-07 11:53 ` [PULL 04/15] tests/functional: skip memaddr tests on 32-bit builds Thomas Huth
2025-03-07 11:53 ` [PULL 05/15] tests/functional: drop unused 'get_tag' method Thomas Huth
2025-03-07 11:53 ` [PULL 06/15] tests/functional: stop output from zstd command when uncompressing Thomas Huth
2025-03-07 11:53 ` Thomas Huth [this message]
2025-03-07 11:53 ` [PULL 08/15] tests/functional/test_mips_malta: Add a network test via the pcnet NIC Thomas Huth
2025-03-07 11:53 ` [PULL 09/15] tests/functional: Increase the timeout of the mips64el_replay test Thomas Huth
2025-03-07 11:53 ` [PULL 10/15] tests/functional: fix race in virtio balloon test Thomas Huth
2025-03-07 12:34 ` Philippe Mathieu-Daudé
2025-03-07 12:39 ` Thomas Huth
2025-03-07 12:42 ` Philippe Mathieu-Daudé
2025-03-07 12:45 ` Daniel P. Berrangé
2025-03-07 11:53 ` [PULL 11/15] tests/functional/test_virtio_balloon: Only use KVM for running this test Thomas Huth
2025-03-07 11:53 ` [PULL 12/15] doc: add missing 'Asset' type in function test doc Thomas Huth
2025-03-07 11:53 ` [PULL 13/15] MAINTAINERS: Add docs/devel/testing/functional.rst to the functional section Thomas Huth
2025-03-07 11:53 ` [PULL 14/15] s390x/pci: add support for guests that request direct mapping Thomas Huth
2025-03-07 11:53 ` [PULL 15/15] s390x/pci: indicate QEMU supports relaxed translation for passthrough Thomas Huth
2025-03-09 0:41 ` [PULL 00/15] Functional and s390x patches before 10.0 soft-freeze Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250307115314.1096373-8-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).