pywatch_test: fix has_py_gdb_support for el9

On CentOS Stream 9, debuginfo packages now include the minor version in the name, so has_py_gdb_support logic needed some rework to support this. Otherwise, it fails to find the gdb support package and fails the test_timeout_backtrace. Signed-off-by: Marcin Sobczyk <[email protected]> Signed-off-by: Albert Esteve <[email protected]>
oVirt · Mar 13, 2023 · a7f8557 · a7f8557
1 parent 4c4a350
commit a7f8557
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/tests/pywatch_test.py b/tests/pywatch_test.py
@@ -43,14 +43,15 @@ def has_py_gdb_support():
     pkg_name = "python{}".format(sys.version_info.major)
     pkg_ver = package_version(pkg_name)
 
-    # On CentOS we we don't have "python2" package and we must query "python"
-    # and "python-debuginfo".
-    if pkg_name == "python2" and not pkg_ver:
-        pkg_name = "python"
-        pkg_ver = package_version(pkg_name)
-
     pkg_dbg_ver = package_version("{}-debuginfo".format(pkg_name))
 
+    # On CentOS Stream 9 debuginfo packages now include the minor version in
+    # the name, i.e. python3.9-debuginfo-...
+    if pkg_dbg_ver == "":
+        pkg_name2 = "python{}.{}".format(sys.version_info.major,
+                                         sys.version_info.minor)
+        pkg_dbg_ver = package_version("{}-debuginfo".format(pkg_name2))
+
     return pkg_dbg_ver != "" and pkg_dbg_ver == pkg_ver