From 8bd6ecdcc3e8d51134950b80bb5b7d7ef7b099b2 Mon Sep 17 00:00:00 2001 From: Jitendra Yejare Date: Thu, 20 Jun 2024 19:16:56 +0530 Subject: [PATCH] Installer Assertions in test context rather than in helper (#15461) --- pytest_fixtures/core/sat_cap_factory.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pytest_fixtures/core/sat_cap_factory.py b/pytest_fixtures/core/sat_cap_factory.py index 7eba78ac14b..7b9aecd50bd 100644 --- a/pytest_fixtures/core/sat_cap_factory.py +++ b/pytest_fixtures/core/sat_cap_factory.py @@ -353,7 +353,6 @@ def installer_satellite(request): :params request: A pytest request object and this fixture is looking for broker object of class satellite """ - sat_version = settings.server.version.release if 'sanity' in request.config.option.markexpr: sat = Satellite(settings.server.hostname) else: @@ -366,9 +365,7 @@ def installer_satellite(request): release=settings.server.version.release, snap=settings.server.version.snap, ) - sat.execute('dnf -y module enable satellite:el8 && dnf -y install satellite') - installed_version = sat.execute('rpm --query satellite').stdout - assert sat_version in installed_version + sat.install_satellite_or_capsule_package() # Install Satellite sat.execute( InstallerCommand(