From 50615993f879ac19df8ad14d26dd7072117afe0e Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Fri, 7 Aug 2020 11:20:41 -0500
Subject: [PATCH] Update integration tests to support rpmfluff-0.6

---
 .../fragments/rpmfluff-compat-fixes.yml       |  2 ++
 .../setup_rpm_repo/files/create-repo.py       | 21 +++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/fragments/rpmfluff-compat-fixes.yml

diff --git a/changelogs/fragments/rpmfluff-compat-fixes.yml b/changelogs/fragments/rpmfluff-compat-fixes.yml
new file mode 100644
index 00000000000000..313af791a89639
--- /dev/null
+++ b/changelogs/fragments/rpmfluff-compat-fixes.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- Address compat with rpmfluff-0.6 for integration tests
diff --git a/test/integration/targets/setup_rpm_repo/files/create-repo.py b/test/integration/targets/setup_rpm_repo/files/create-repo.py
index ec2c1240125d8e..a4d10140a0b747 100644
--- a/test/integration/targets/setup_rpm_repo/files/create-repo.py
+++ b/test/integration/targets/setup_rpm_repo/files/create-repo.py
@@ -5,8 +5,21 @@
 
 import sys
 from collections import namedtuple
-import rpmfluff
 
+try:
+    from rpmfluff import SimpleRpmBuild
+    from rpmfluff import YumRepoBuild
+except ImportError:
+    from rpmfluff.rpmbuild import SimpleRpmBuild
+    from rpmfluff.yumrepobuild import YumRepoBuild
+
+try:
+    from rpmfluff import can_use_rpm_weak_deps
+except ImportError:
+    try:
+        from rpmfluff.utils import can_use_rpm_weak_deps
+    except ImportError:
+        can_use_rpm_weak_deps = None
 
 RPM = namedtuple('RPM', ['name', 'version', 'release', 'epoch', 'recommends'])
 
@@ -32,12 +45,12 @@ def main():
 
     pkgs = []
     for spec in SPECS:
-        pkg = rpmfluff.SimpleRpmBuild(spec.name, spec.version, spec.release, [arch])
+        pkg = SimpleRpmBuild(spec.name, spec.version, spec.release, [arch])
         pkg.epoch = spec.epoch
 
         if spec.recommends:
             # Skip packages that require weak deps but an older version of RPM is being used
-            if not hasattr(rpmfluff, "can_use_rpm_weak_deps") or not rpmfluff.can_use_rpm_weak_deps():
+            if not can_use_rpm_weak_deps or not can_use_rpm_weak_deps():
                 continue
 
             for recommend in spec.recommends:
@@ -45,7 +58,7 @@ def main():
 
         pkgs.append(pkg)
 
-    repo = rpmfluff.YumRepoBuild(pkgs)
+    repo = YumRepoBuild(pkgs)
     repo.make(arch)
 
     for pkg in pkgs: