From c8344e1f8f61cbfd8de1326eb1d6899dc09d7d64 Mon Sep 17 00:00:00 2001 From: Jaroslav Mracek Date: Mon, 29 Apr 2024 10:29:45 +0200 Subject: [PATCH] Modify tests or outpit check according to new format with repo names Message was modified from `Warning: skipped PGP checks for 1 package(s).` to `Warning: skipped PGP checks for 1 package from repository: comps-group` --- dnf-behave-tests/dnf/comps-group.feature | 4 ++-- dnf-behave-tests/dnf/distro-sync.feature | 4 ++-- dnf-behave-tests/dnf/downgrade.feature | 6 +++--- dnf-behave-tests/dnf/download-source.feature | 4 ++-- dnf-behave-tests/dnf/focusbest.feature | 4 ++-- dnf-behave-tests/dnf/install-dependencies.feature | 2 +- dnf-behave-tests/dnf/install-file-conflicts.feature | 2 +- dnf-behave-tests/dnf/install-non-existent.feature | 2 +- dnf-behave-tests/dnf/obsoletes.feature | 2 +- dnf-behave-tests/dnf/reinstall.feature | 4 ++-- dnf-behave-tests/dnf/upgrade.feature | 10 +++++----- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dnf-behave-tests/dnf/comps-group.feature b/dnf-behave-tests/dnf/comps-group.feature index 8598b20bb..c36941b7b 100644 --- a/dnf-behave-tests/dnf/comps-group.feature +++ b/dnf-behave-tests/dnf/comps-group.feature @@ -506,7 +506,7 @@ Scenario: Install an environment with a nonexistent group """ No match for group from environment: nonexistent-group - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: comps-group """ @@ -525,7 +525,7 @@ Scenario: Install an environment using @^environment syntax """ No match for group from environment: nonexistent-group - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: comps-group """ diff --git a/dnf-behave-tests/dnf/distro-sync.feature b/dnf-behave-tests/dnf/distro-sync.feature index 5ecc21780..5ababd32e 100644 --- a/dnf-behave-tests/dnf/distro-sync.feature +++ b/dnf-behave-tests/dnf/distro-sync.feature @@ -129,7 +129,7 @@ Scenario: distro-sync list of packages with --skip-unavailable, one of them is n """ No match for argument: nosuchpkg - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates """ And Transaction is following | Action | Package | @@ -164,7 +164,7 @@ Scenario: distro-sync list of packages with --skip-unavailable, one of them is n """ Packages for argument 'dwm' available, but not installed. - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates """ And Transaction is following | Action | Package | diff --git a/dnf-behave-tests/dnf/downgrade.feature b/dnf-behave-tests/dnf/downgrade.feature index 02a90cbdf..feada3d37 100644 --- a/dnf-behave-tests/dnf/downgrade.feature +++ b/dnf-behave-tests/dnf/downgrade.feature @@ -125,7 +125,7 @@ Scenario: Downgrade list of packages with --skip-unavailable, one of them is not """ No match for argument: nosuchpkg - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates """ And Transaction is following | Action | Package | @@ -154,7 +154,7 @@ Scenario: Downgrade list of packages with --skip-unavailable, one of them is not """ Packages for argument 'abcde' available, but not installed. - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates """ And Transaction is following | Action | Package | @@ -189,7 +189,7 @@ Scenario: Downgrade mixture of not available/not installed/not downgradable/down The lowest available version of the "wget.x86_64" package is already installed, cannot downgrade it. Packages for argument 'abcde' available, but not installed. - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates """ And Transaction is following | Action | Package | diff --git a/dnf-behave-tests/dnf/download-source.feature b/dnf-behave-tests/dnf/download-source.feature index 90c024c07..657143b3e 100644 --- a/dnf-behave-tests/dnf/download-source.feature +++ b/dnf-behave-tests/dnf/download-source.feature @@ -111,7 +111,7 @@ Given I make packages from repository "dnf-ci-fedora" accessible via http Then the exit code is 0 And stderr is """ - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora """ And Transaction is following | Action | Package | @@ -131,7 +131,7 @@ Given I make packages from repository "dnf-ci-fedora" accessible via http Then the exit code is 0 And stderr is """ - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora """ And Transaction is following | Action | Package | diff --git a/dnf-behave-tests/dnf/focusbest.feature b/dnf-behave-tests/dnf/focusbest.feature index 225aa6702..d6bd4b429 100644 --- a/dnf-behave-tests/dnf/focusbest.feature +++ b/dnf-behave-tests/dnf/focusbest.feature @@ -17,7 +17,7 @@ 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 package(s). + Warning: skipped PGP checks for 3 packages from repository: focusbest """ @@ -32,5 +32,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 package(s). + Warning: skipped PGP checks for 2 packages from repository: focusbest """ diff --git a/dnf-behave-tests/dnf/install-dependencies.feature b/dnf-behave-tests/dnf/install-dependencies.feature index 06fe5ea2e..c5950e7ca 100644 --- a/dnf-behave-tests/dnf/install-dependencies.feature +++ b/dnf-behave-tests/dnf/install-dependencies.feature @@ -22,5 +22,5 @@ Scenario: Best candidates have conflicting dependencies - cannot install the best candidate for the job - conflicting requests - Warning: skipped PGP checks for 3 package(s). + Warning: skipped PGP checks for 3 packages from repository: install-dependencies """ diff --git a/dnf-behave-tests/dnf/install-file-conflicts.feature b/dnf-behave-tests/dnf/install-file-conflicts.feature index 581d0aca1..a8c44acb1 100644 --- a/dnf-behave-tests/dnf/install-file-conflicts.feature +++ b/dnf-behave-tests/dnf/install-file-conflicts.feature @@ -15,6 +15,6 @@ Scenario: An error is reported when a package with a file conflict is tried to b And stderr is """ Transaction failed: Rpm transaction failed. - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-install-conflicts - file /usr/lib/package/conflicting-file from install of package-two-0:1.0-1.x86_64 conflicts with file from package package-one-0:1.0-1.x86_64 """ diff --git a/dnf-behave-tests/dnf/install-non-existent.feature b/dnf-behave-tests/dnf/install-non-existent.feature index 4d2cd9eda..db8bcd107 100644 --- a/dnf-behave-tests/dnf/install-non-existent.feature +++ b/dnf-behave-tests/dnf/install-non-existent.feature @@ -49,7 +49,7 @@ Scenario: Install an existent and an non-existent package with --skip-unavailabl """ No match for argument: non-existent-package - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora """ And Transaction is following | Action | Package | diff --git a/dnf-behave-tests/dnf/obsoletes.feature b/dnf-behave-tests/dnf/obsoletes.feature index f8ac3387e..9001d3105 100644 --- a/dnf-behave-tests/dnf/obsoletes.feature +++ b/dnf-behave-tests/dnf/obsoletes.feature @@ -296,7 +296,7 @@ Scenario: Obsoleted package is not installed when group contains both obsoleter | group-install | Obsoleter and obsoleted | And stderr is """ - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-obsoletes """ diff --git a/dnf-behave-tests/dnf/reinstall.feature b/dnf-behave-tests/dnf/reinstall.feature index 3bc579694..6e1136db0 100644 --- a/dnf-behave-tests/dnf/reinstall.feature +++ b/dnf-behave-tests/dnf/reinstall.feature @@ -73,7 +73,7 @@ Scenario: Reinstall list of packages with --skip-unavailable, one of them is not """ No match for argument: nosuchpkg - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates """ And Transaction is following | Action | Package | @@ -98,7 +98,7 @@ Scenario: Reinstall list of packages with --skip-unavailable, one of them is not """ Packages for argument 'abcde' available, but not installed. - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates """ And Transaction is following | Action | Package | diff --git a/dnf-behave-tests/dnf/upgrade.feature b/dnf-behave-tests/dnf/upgrade.feature index ad2a609f0..06512ff56 100644 --- a/dnf-behave-tests/dnf/upgrade.feature +++ b/dnf-behave-tests/dnf/upgrade.feature @@ -83,7 +83,7 @@ Scenario: Upgrade list of packages with --skip-unavailable, one of them is not a """ No match for argument: nosuchpkg - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates """ And Transaction is following | Action | Package | @@ -112,7 +112,7 @@ Scenario: Upgrade list of packages with --skip-unavailable, one of them is not i """ Packages for argument 'dwm' available, but not installed. - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates """ And Transaction is following | Action | Package | @@ -136,7 +136,7 @@ Scenario: Upgrade all RPMs from multiple repositories with best=False Problem: cannot install the best update candidate for package SuperRipper-1.0-1.x86_64 - nothing provides unsatisfiable needed by SuperRipper-1.3-1.x86_64 from dnf-ci-thirdparty-updates - Warning: skipped PGP checks for 7 package(s). + Warning: skipped PGP checks for 7 packages from repositories: dnf-ci-fedora-updates, dnf-ci-fedora-updates-testing, dnf-ci-thirdparty-updates """ And Transaction is following | Action | Package | @@ -187,7 +187,7 @@ Scenario: Upgrade all RPMs from multiple repositories with best=True Problem: cannot install the best update candidate for package SuperRipper-1.0-1.x86_64 - nothing provides unsatisfiable needed by SuperRipper-1.3-1.x86_64 from dnf-ci-thirdparty-updates - Warning: skipped PGP checks for 7 package(s). + Warning: skipped PGP checks for 7 packages from repositories: dnf-ci-fedora-updates, dnf-ci-fedora-updates-testing, dnf-ci-thirdparty-updates """ @@ -206,7 +206,7 @@ Scenario: Print information about skipped packages Problem: cannot install the best update candidate for package SuperRipper-1.0-1.x86_64 - nothing provides unsatisfiable needed by SuperRipper-1.3-1.x86_64 from dnf-ci-thirdparty-updates - Warning: skipped PGP checks for 1 package(s). + Warning: skipped PGP checks for 1 package from repository: dnf-ci-thirdparty-updates """