Hi, following patch solves three issues with running libvirt test on RHEL5 Xen host from next branch:
1) Patch 399604d44c9674d936b0a9d499e826df21952b02 renamed range variable in do_GET method to rg. Unfortunately, not all usage of this variable was renamed so server can't be used for hosting installation repository (needed for xen pv installation). This issue is fixed renaming all instances to correct name 2) Patch 5169d9c128eb6ed879d55b711e3e8c02ce880b4a introduce normalize_connect_uri method and use qemu in case default is used. This prevents xen to be properly recognized. This is fixed adding connect_uri into the test.cfg 3) Patch 0a0f49e9fc3d437fa8ce61d217fe9b3c39e302eb copies src files into test.srcdir using shutil.copytree function. However, this function raise error in python version < 2.5 in case we try to copy to non-existing location (since 2.5 needed structure is created instead). This cause error when running on RHEL 5. This is fixed by creating structure to copy required directory. Signed-off-by: Miroslav Rezanina <[email protected]> Patch: --- diff --git a/client/shared/base_utils.py b/client/shared/base_utils.py index 0b280fc..568e3e0 100644 --- a/client/shared/base_utils.py +++ b/client/shared/base_utils.py @@ -782,11 +782,14 @@ def update_version(srcdir, preserve_srcdir, new_version, install, break if not os.path.isdir(srcdir): + tdir = os.path.dirname(srcdir) + if not os.path.isdir(tdir): + os.makedirs(tdir) if os.path.isdir(source_code_dir): shutil.copytree(source_code_dir, srcdir) else: - os.makedirs(srcdir) - + os.mkdir(srcdir) + patch_file_list = glob.glob(os.path.join( (os.path.dirname(source_code_dir)), "*.patch")) for patch_src in patch_file_list: diff --git a/client/tests/virt/libvirt/cfg/tests.cfg.sample b/client/tests/virt/libvirt/cfg/tests.cfg.sample index fb89d58..918cbc8 100644 --- a/client/tests/virt/libvirt/cfg/tests.cfg.sample +++ b/client/tests/virt/libvirt/cfg/tests.cfg.sample @@ -28,6 +28,7 @@ variants: qemu_img_binary = /usr/bin/qemu-img hvm_or_pv = pv take_regular_screendumps = no + connect_uri = xen only raw only xennet only xenblk @@ -46,6 +47,7 @@ variants: hvm_or_pv = hvm take_regular_screendumps = no drive_cache = + connect_uri = xen only raw only rtl8139 only ide diff --git a/client/tests/virt/virttest/http_server.py b/client/tests/virt/virttest/http_server.py index 50b969f..1c97186 100644 --- a/client/tests/virt/virttest/http_server.py +++ b/client/tests/virt/virttest/http_server.py @@ -10,9 +10,9 @@ class HTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): """ rg = self.parse_header_byte_range() if rg: - f = self.send_head_range(range[0], range[1]) + f = self.send_head_range(rg[0], rg[1]) if f: - self.copyfile_range(f, self.wfile, range[0], range[1]) + self.copyfile_range(f, self.wfile, rg[0], rg[1]) f.close() else: f = self.send_head() --- Miroslav Rezanina Software Engineer - Virtualization Team - XEN kernel _______________________________________________ Autotest-kernel mailing list [email protected] https://www.redhat.com/mailman/listinfo/autotest-kernel
