From 816f1c454bfcc7606fc18966289a580ea06f6020 Mon Sep 17 00:00:00 2001 From: bgrech Date: Tue, 17 Jan 2023 09:46:52 -0600 Subject: [PATCH] Modify rpm-ostree options for new parameter rpm-ostree behavior has been modified, and implemented an assume yes param ie -y, implementing here. --- tests/unit/test_package_managers.py | 14 +++++++------- tmt/package_managers/rpm_ostree.py | 2 +- tmt/steps/prepare/install.py | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/unit/test_package_managers.py b/tests/unit/test_package_managers.py index 331e74a215..ddce5e2571 100644 --- a/tests/unit/test_package_managers.py +++ b/tests/unit/test_package_managers.py @@ -394,7 +394,7 @@ def _parametrize_test_install() -> \ yield container, \ package_manager_class, \ Package('tree'), \ - r"rpm -q --whatprovides tree \|\| rpm-ostree install --apply-live --idempotent --allow-inactive tree", \ + r"rpm -q --whatprovides tree \|\| rpm-ostree install --apply-live --idempotent --allow-inactive --assumeyes tree", \ 'Installing: tree' # noqa: E501 elif package_manager_class is tmt.package_managers.apk.Apk: @@ -579,7 +579,7 @@ def _parametrize_test_install_nonexistent() -> \ elif package_manager_class is tmt.package_managers.rpm_ostree.RpmOstree: yield container, \ package_manager_class, \ - r"rpm -q --whatprovides tree-but-spelled-wrong \|\| rpm-ostree install --apply-live --idempotent --allow-inactive tree-but-spelled-wrong", \ + r"rpm -q --whatprovides tree-but-spelled-wrong \|\| rpm-ostree install --apply-live --idempotent --allow-inactive --assumeyes tree-but-spelled-wrong", \ 'no package provides tree-but-spelled-wrong' # noqa: E501 elif package_manager_class is tmt.package_managers.apk.Apk: @@ -673,7 +673,7 @@ def _parametrize_test_install_nonexistent_skip() -> \ elif package_manager_class is tmt.package_managers.rpm_ostree.RpmOstree: yield container, \ package_manager_class, \ - r"rpm -q --whatprovides tree-but-spelled-wrong \|\| rpm-ostree install --apply-live --idempotent --allow-inactive tree-but-spelled-wrong \|\| /bin/true", \ + r"rpm -q --whatprovides tree-but-spelled-wrong \|\| rpm-ostree install --apply-live --idempotent --allow-inactive --assumeyes tree-but-spelled-wrong \|\| /bin/true", \ 'no package provides tree-but-spelled-wrong' # noqa: E501 elif package_manager_class is tmt.package_managers.apk.Apk: @@ -771,7 +771,7 @@ def _parametrize_test_install_dont_check_first() -> \ yield container, \ package_manager_class, \ Package('tree'), \ - r"rpm-ostree install --apply-live --idempotent --allow-inactive tree", \ + r"rpm-ostree install --apply-live --idempotent --allow-inactive --assumeyes tree", \ 'Installing: tree' elif package_manager_class is tmt.package_managers.apk.Apk: @@ -1356,7 +1356,7 @@ def _parametrize_test_install_filesystempath() -> Iterator[ yield container, \ package_manager_class, \ FileSystemPath('/usr/bin/dos2unix'), \ - r"rpm -qf /usr/bin/dos2unix \|\| rpm-ostree install --apply-live --idempotent --allow-inactive /usr/bin/dos2unix", \ + r"rpm -qf /usr/bin/dos2unix \|\| rpm-ostree install --apply-live --idempotent --allow-inactive --assumeyes /usr/bin/dos2unix", \ "Installing 1 packages:\n dos2unix-" # noqa: E501 elif package_manager_class is tmt.package_managers.apk.Apk: @@ -1473,7 +1473,7 @@ def _parametrize_test_install_multiple() -> \ yield container, \ package_manager_class, \ (Package('tree'), Package('nano')), \ - r"rpm -q --whatprovides tree nano \|\| rpm-ostree install --apply-live --idempotent --allow-inactive tree nano", \ + r"rpm -q --whatprovides tree nano \|\| rpm-ostree install --apply-live --idempotent --allow-inactive --assumeyes tree nano", \ 'Installing: tree' # noqa: E501 elif package_manager_class is tmt.package_managers.apk.Apk: @@ -1603,7 +1603,7 @@ def _parametrize_test_install_downloaded() -> \ package_manager_class, \ (Package('tree'), Package('cowsay')), \ ('tree*.x86_64.rpm', 'cowsay*.noarch.rpm'), \ - r"rpm-ostree install --apply-live --idempotent --allow-inactive /tmp/tree.rpm /tmp/cowsay.rpm", \ + r"rpm-ostree install --apply-live --idempotent --allow-inactive --assumeyes /tmp/tree.rpm /tmp/cowsay.rpm", \ 'Installing: tree' # noqa: E501 elif package_manager_class is tmt.package_managers.apt.Apt: diff --git a/tmt/package_managers/rpm_ostree.py b/tmt/package_managers/rpm_ostree.py index b37532c38f..b89a667617 100644 --- a/tmt/package_managers/rpm_ostree.py +++ b/tmt/package_managers/rpm_ostree.py @@ -31,7 +31,7 @@ def prepare_command(self) -> tuple[Command, Command]: command += Command('rpm-ostree') - options = Command('--apply-live', '--idempotent', '--allow-inactive') + options = Command('--apply-live', '--idempotent', '--allow-inactive', '--assumeyes') return (command, options) diff --git a/tmt/steps/prepare/install.py b/tmt/steps/prepare/install.py index 8178bb4810..034756a0a5 100644 --- a/tmt/steps/prepare/install.py +++ b/tmt/steps/prepare/install.py @@ -392,7 +392,6 @@ def sort_packages(self) -> None: else: self.required_packages.append(package) - def install_debuginfo(self) -> None: """ Install debuginfo packages """ self.warn("Installation of debuginfo packages not supported yet.")