Skip to content

Commit

Permalink
Update integration tests to support rpmfluff-0.6 (ansible#71155)
Browse files Browse the repository at this point in the history
  • Loading branch information
sivel authored and zoredache committed Aug 10, 2020
1 parent b9cab51 commit ad37672
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/rpmfluff-compat-fixes.yml
@@ -0,0 +1,2 @@
bugfixes:
- Address compat with rpmfluff-0.6 for integration tests
21 changes: 17 additions & 4 deletions test/integration/targets/setup_rpm_repo/files/create-repo.py
Expand Up @@ -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'])

Expand All @@ -32,20 +45,20 @@ 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:
pkg.add_recommends(recommend)

pkgs.append(pkg)

repo = rpmfluff.YumRepoBuild(pkgs)
repo = YumRepoBuild(pkgs)
repo.make(arch)

for pkg in pkgs:
Expand Down

0 comments on commit ad37672

Please sign in to comment.