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.
Signed-off-by: Thomas Huth <th...@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
