From 6e765726d0fbd213c32f43f6ebdf8a12029a4d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Mon, 15 Jul 2024 14:17:09 +0200 Subject: [PATCH] Rename and enable tests for install latest dependencies Requires: https://github.com/rpm-software-management/dnf5/pull/1582 --- ...ocusbest.feature => install-latest-deps.feature} | 13 +++++-------- .../ipa-client-1.0-1.fc29.spec | 0 .../krb5-libs-1.0-1.fc29.spec | 0 .../krb5-libs-2.0-1.fc29.spec | 0 .../krb5-pkinit-1.0-1.fc29.spec | 0 .../krb5-pkinit-2.0-1.fc29.spec | 0 6 files changed, 5 insertions(+), 8 deletions(-) rename dnf-behave-tests/dnf/{focusbest.feature => install-latest-deps.feature} (82%) rename dnf-behave-tests/fixtures/specs/{focusbest => install-latest-deps}/ipa-client-1.0-1.fc29.spec (100%) rename dnf-behave-tests/fixtures/specs/{focusbest => install-latest-deps}/krb5-libs-1.0-1.fc29.spec (100%) rename dnf-behave-tests/fixtures/specs/{focusbest => install-latest-deps}/krb5-libs-2.0-1.fc29.spec (100%) rename dnf-behave-tests/fixtures/specs/{focusbest => install-latest-deps}/krb5-pkinit-1.0-1.fc29.spec (100%) rename dnf-behave-tests/fixtures/specs/{focusbest => install-latest-deps}/krb5-pkinit-2.0-1.fc29.spec (100%) diff --git a/dnf-behave-tests/dnf/focusbest.feature b/dnf-behave-tests/dnf/install-latest-deps.feature similarity index 82% rename from dnf-behave-tests/dnf/focusbest.feature rename to dnf-behave-tests/dnf/install-latest-deps.feature index d6bd4b429..f86effd1a 100644 --- a/dnf-behave-tests/dnf/focusbest.feature +++ b/dnf-behave-tests/dnf/install-latest-deps.feature @@ -1,12 +1,9 @@ @dnf5 -Feature: Always use the latest packages even for dependecies +Feature: Always use the latest packages when installing dependecies -# The focusbest behavior has been reverted. -# It might become an option in the future. -@xfail Scenario: prefer installing latests dependencies rather than smaller transaction - Given I use repository "focusbest" + Given I use repository "install-latest-deps" And I successfully execute dnf with args "install krb5-libs-1.0" When I execute dnf with args "install ipa-client" Then the exit code is 0 @@ -17,12 +14,12 @@ Scenario: prefer installing latests dependencies rather than smaller transaction | upgrade | krb5-libs-0:2.0-1.fc29.x86_64 | And stderr is """ - Warning: skipped PGP checks for 3 packages from repository: focusbest + Warning: skipped PGP checks for 3 packages from repository: install-latest-deps """ Scenario: if latests dependencies are not possible to install fall back to lower versions without errors - Given I use repository "focusbest" + Given I use repository "install-latest-deps" And I successfully execute dnf with args "install krb5-libs-1.0" When I execute dnf with args "install ipa-client -x krb5-libs-2.0" Then the exit code is 0 @@ -32,5 +29,5 @@ Scenario: if latests dependencies are not possible to install fall back to lower | install-dep | krb5-pkinit-0:1.0-1.fc29.x86_64 | And stderr is """ - Warning: skipped PGP checks for 2 packages from repository: focusbest + Warning: skipped PGP checks for 2 packages from repository: install-latest-deps """ diff --git a/dnf-behave-tests/fixtures/specs/focusbest/ipa-client-1.0-1.fc29.spec b/dnf-behave-tests/fixtures/specs/install-latest-deps/ipa-client-1.0-1.fc29.spec similarity index 100% rename from dnf-behave-tests/fixtures/specs/focusbest/ipa-client-1.0-1.fc29.spec rename to dnf-behave-tests/fixtures/specs/install-latest-deps/ipa-client-1.0-1.fc29.spec diff --git a/dnf-behave-tests/fixtures/specs/focusbest/krb5-libs-1.0-1.fc29.spec b/dnf-behave-tests/fixtures/specs/install-latest-deps/krb5-libs-1.0-1.fc29.spec similarity index 100% rename from dnf-behave-tests/fixtures/specs/focusbest/krb5-libs-1.0-1.fc29.spec rename to dnf-behave-tests/fixtures/specs/install-latest-deps/krb5-libs-1.0-1.fc29.spec diff --git a/dnf-behave-tests/fixtures/specs/focusbest/krb5-libs-2.0-1.fc29.spec b/dnf-behave-tests/fixtures/specs/install-latest-deps/krb5-libs-2.0-1.fc29.spec similarity index 100% rename from dnf-behave-tests/fixtures/specs/focusbest/krb5-libs-2.0-1.fc29.spec rename to dnf-behave-tests/fixtures/specs/install-latest-deps/krb5-libs-2.0-1.fc29.spec diff --git a/dnf-behave-tests/fixtures/specs/focusbest/krb5-pkinit-1.0-1.fc29.spec b/dnf-behave-tests/fixtures/specs/install-latest-deps/krb5-pkinit-1.0-1.fc29.spec similarity index 100% rename from dnf-behave-tests/fixtures/specs/focusbest/krb5-pkinit-1.0-1.fc29.spec rename to dnf-behave-tests/fixtures/specs/install-latest-deps/krb5-pkinit-1.0-1.fc29.spec diff --git a/dnf-behave-tests/fixtures/specs/focusbest/krb5-pkinit-2.0-1.fc29.spec b/dnf-behave-tests/fixtures/specs/install-latest-deps/krb5-pkinit-2.0-1.fc29.spec similarity index 100% rename from dnf-behave-tests/fixtures/specs/focusbest/krb5-pkinit-2.0-1.fc29.spec rename to dnf-behave-tests/fixtures/specs/install-latest-deps/krb5-pkinit-2.0-1.fc29.spec