From b3c005990a0e79328e993d1989d850bc80ba47ee Mon Sep 17 00:00:00 2001 From: Pavla Kratochvilova Date: Fri, 1 Nov 2024 13:47:06 +0100 Subject: [PATCH] Simplify dnf5 tags --- dnf-behave-tests/dnf/list.feature | 26 +++---------------- dnf-behave-tests/dnf/log-rotate.feature | 3 +-- dnf-behave-tests/dnf/logs.feature | 1 + dnf-behave-tests/dnf/mark.feature | 16 +++--------- dnf-behave-tests/dnf/metadata.feature | 7 ++--- dnf-behave-tests/dnf/obsoletes.feature | 20 ++++---------- .../dnf/proxy-username-password.feature | 3 +-- 7 files changed, 16 insertions(+), 60 deletions(-) diff --git a/dnf-behave-tests/dnf/list.feature b/dnf-behave-tests/dnf/list.feature index b1f779875..310d99679 100644 --- a/dnf-behave-tests/dnf/list.feature +++ b/dnf-behave-tests/dnf/list.feature @@ -1,3 +1,4 @@ +@dnf5 Feature: Test for dnf list (including all documented suboptions and yum compatibility) @@ -5,7 +6,6 @@ Background: Enable dnf-ci-fedora repository Given I use repository "dnf-ci-fedora" -@dnf5 Scenario: dnf list nonexistentpkg When I execute dnf with args "list non-existent-pkg" Then the exit code is 1 @@ -16,7 +16,6 @@ Scenario: dnf list nonexistentpkg """ -@dnf5 Scenario: List all packages available When I execute dnf with args "list" Then the exit code is 0 @@ -27,7 +26,6 @@ Scenario: List all packages available Then stdout section "Available packages" contains "glibc-all-langpacks.x86_64\s+2.28-9.fc29\s+dnf-ci-fedora" -@dnf5 Scenario: dnf list --extras (installed pkgs, not from known repos) When I execute dnf with args "install setup" Then the exit code is 0 @@ -45,7 +43,6 @@ Given I drop repository "dnf-ci-fedora" """ -@dnf5 Scenario: dnf list setup (when setup is installed) When I execute dnf with args "install setup" Then the exit code is 0 @@ -61,7 +58,7 @@ Given I drop repository "dnf-ci-fedora" setup.noarch +2.12.1-1.fc29 +dnf-ci-fedora """ -@dnf5 + Scenario: dnf list is case insensitive When I execute dnf with args "install setup" Then the exit code is 0 @@ -77,7 +74,7 @@ Given I drop repository "dnf-ci-fedora" setup.noarch +2.12.1-1.fc29 +dnf-ci-fedora """ -@dnf5 + Scenario: dnf list setup (when setup is not installed but it is available) When I execute dnf with args "list setup" Then stderr is @@ -92,7 +89,6 @@ Scenario: dnf list setup (when setup is not installed but it is available) """ -@dnf5 Scenario: dnf list --installed setup (when setup is installed) When I execute dnf with args "install setup" Then the exit code is 0 @@ -109,7 +105,6 @@ Given I drop repository "dnf-ci-fedora" """ -@dnf5 Scenario: List --installed alias packages from all enabled repositories When I execute dnf with args "install glibc" Then the exit code is 0 @@ -131,7 +126,6 @@ Scenario: List --installed alias packages from all enabled repositories """ -@dnf5 Scenario: dnf list --available setup (when setup is available) When I execute dnf with args "list --available setup" Then stderr is @@ -146,7 +140,6 @@ Scenario: dnf list --available setup (when setup is available) """ -@dnf5 Scenario: dnf list setup basesystem (when basesystem is not installed) When I execute dnf with args "install setup" Then the exit code is 0 @@ -167,7 +160,6 @@ Scenario: dnf list setup basesystem (when basesystem is not installed) """ -@dnf5 Scenario: dnf list installed setup basesystem (when basesystem is not installed) When I execute dnf with args "install setup" Then the exit code is 0 @@ -185,7 +177,6 @@ Scenario: dnf list installed setup basesystem (when basesystem is not installed) # Change in behavior compared to dnf4 - Available section contains all available # packages, installed versions are not filtered out -@dnf5 Scenario: dnf list available setup basesystem (when basesystem is available) When I execute dnf with args "install setup" Then the exit code is 0 @@ -204,7 +195,6 @@ Scenario: dnf list available setup basesystem (when basesystem is available) """ -@dnf5 Scenario: dnf list setup basesystem (when both are installed) When I execute dnf with args "install setup basesystem" Then the exit code is 0 @@ -250,7 +240,6 @@ Scenario: dnf list setup basesystem (when both are installed) """ -@dnf5 Scenario: dnf list glibc\* When I execute dnf with args "install glibc" Then the exit code is 0 @@ -263,7 +252,6 @@ Given I use repository "dnf-ci-fedora-updates" Then stdout does not contain "setup" -@dnf5 Scenario Outline: dnf list When I execute dnf with args "install glibc" Then the exit code is 0 @@ -288,7 +276,6 @@ Examples: | --updates | -@dnf5 Scenario: dnf list upgrades glibc (when glibc is not installed) Given I use repository "dnf-ci-fedora-updates" When I execute dnf with args "list --upgrades glibc" @@ -301,7 +288,6 @@ Given I use repository "dnf-ci-fedora-updates" And stdout is empty -@dnf5 Scenario: dnf list --obsoletes When I execute dnf with args "install glibc" Then the exit code is 0 @@ -320,7 +306,6 @@ Given I use repository "dnf-ci-fedora-updates" """ -@dnf5 Scenario: dnf list obsoletes setup (when setup is not obsoleted) When I execute dnf with args "install setup" Then the exit code is 0 @@ -342,7 +327,6 @@ Given I use repository "dnf-ci-thirdparty" Then stdout contains "forTestingPurposesWeEvenHaveReallyLongVersions.x86_64\s+1435347658326856238756823658aaaa-1\s+dnf-ci-thirdparty" -@dnf5 @bz1800342 Scenario: dnf list respects repo priorities Given I use repository "dnf-ci-fedora-updates" with configuration @@ -362,7 +346,6 @@ Scenario: dnf list respects repo priorities """ -@dnf5 Scenario: dnf list --showduplicates lists all (even from lower-priority repo) Given I use repository "dnf-ci-fedora-updates" with configuration | key | value | @@ -384,7 +367,6 @@ Scenario: dnf list --showduplicates lists all (even from lower-priority repo) """ -@dnf5 @bz1800342 Scenario: dnf list doesn't show any available packages when there are no upgrades in the highest-priority repo Given I use repository "dnf-ci-fedora-updates" with configuration @@ -405,7 +387,6 @@ Scenario: dnf list doesn't show any available packages when there are no upgrade """ -@dnf5 Scenario: dnf list shows available packages when there are upgrades in the highest-priority repo Given I use repository "dnf-ci-fedora-updates" with configuration | key | value | @@ -428,7 +409,6 @@ Scenario: dnf list shows available packages when there are upgrades in the highe """ -@dnf5 Scenario: dnf list doesn't show package with same nevra from lower-priority repo Given I configure a new repository "dnf-ci-fedora2" with | key | value | diff --git a/dnf-behave-tests/dnf/log-rotate.feature b/dnf-behave-tests/dnf/log-rotate.feature index 1eb9890d2..fbcca3009 100644 --- a/dnf-behave-tests/dnf/log-rotate.feature +++ b/dnf-behave-tests/dnf/log-rotate.feature @@ -1,5 +1,4 @@ -# @dnf5 -# TODO(nsella) different stdout +@dnf5 Feature: Log rotation diff --git a/dnf-behave-tests/dnf/logs.feature b/dnf-behave-tests/dnf/logs.feature index b33eeaa5a..5c4ddcde3 100644 --- a/dnf-behave-tests/dnf/logs.feature +++ b/dnf-behave-tests/dnf/logs.feature @@ -1,3 +1,4 @@ +@dnf5 Feature: Logs diff --git a/dnf-behave-tests/dnf/mark.feature b/dnf-behave-tests/dnf/mark.feature index 3c0d4b0c7..6cc29dd66 100644 --- a/dnf-behave-tests/dnf/mark.feature +++ b/dnf-behave-tests/dnf/mark.feature @@ -1,7 +1,7 @@ +@dnf5 Feature: Mark command -@dnf5 Scenario Outline: Marking non-existent package as fails Given I use repository "dnf-ci-fedora" When I execute dnf with args "mark nosuchpkg" @@ -19,7 +19,6 @@ Examples: | weak | -@dnf5 Scenario: Marking as group for non-existent package or non-existent group fails Given I use repository "dnf-ci-thirdparty" And I use repository "dnf-ci-fedora" @@ -39,7 +38,6 @@ Scenario: Marking as group for non-existent package or non-existent group fails """ -@dnf5 Scenario: Marking available but not installed package fails Given I use repository "dnf-ci-fedora" When I execute dnf with args "mark user lame" @@ -51,7 +49,6 @@ Scenario: Marking available but not installed package fails """ -@dnf5 Scenario: Marking as dependency a list of pkgs when one of them is not available fails Given I use repository "dnf-ci-fedora" When I execute dnf with args "install lame" @@ -68,7 +65,6 @@ Scenario: Marking as dependency a list of pkgs when one of them is not available | lame-libs-3.100-4.fc29.x86_64 | Dependency | -@dnf5 Scenario: Marking as dependency a list of pkgs when one of them is not available passes with --skip-unavailable Given I use repository "dnf-ci-fedora" When I execute dnf with args "install lame" @@ -84,7 +80,6 @@ Scenario: Marking as dependency a list of pkgs when one of them is not available | lame-libs-3.100-4.fc29.x86_64 | Dependency | -@dnf5 Scenario Outline: Mark user installed package as Given I use repository "dnf-ci-fedora" When I execute dnf with args "install lame" @@ -102,7 +97,6 @@ Examples: | weak | Weak Dependency | -@dnf5 Scenario Outline: Mark package installed as dependency as Given I use repository "dnf-ci-fedora" When I execute dnf with args "install filesystem" @@ -124,7 +118,6 @@ Examples: | weak | Weak Dependency | -@dnf5 Scenario: Mark package as the same reason it currently has Given I use repository "dnf-ci-fedora" When I execute dnf with args "install lame" @@ -146,7 +139,7 @@ Scenario: Mark package as the same reason it currently has """ -#@dnf5 currently fails, see: +@xfail # https://github.com/rpm-software-management/dnf5/issues/935 Scenario: Mark user installed package as group Given I use repository "dnf-ci-thirdparty" @@ -172,7 +165,7 @@ Scenario: Mark user installed package as group | setup-2.12.1-1.fc29.noarch | Dependency | -#@dnf5 currently fails, see: +@xfail # https://github.com/rpm-software-management/dnf5/issues/935 # TODO (emrakova): update the scenario when the issue is fixed Scenario: Mark group installed package as user and back again @@ -202,7 +195,6 @@ Scenario: Mark group installed package as user and back again """ -@dnf5 Scenario: Marking dependency as user-installed should not remove it automatically Given I use repository "dnf-ci-fedora" When I execute dnf with args "install filesystem" @@ -226,7 +218,6 @@ Scenario: Marking dependency as user-installed should not remove it automaticall | remove | setup-0:2.12.1-1.fc29.noarch | -@dnf5 @bz2046581 Scenario: Marking installed package when history DB is not on the system (deleted or not created yet) When I execute rpm with args "-i {context.dnf.fixturesdir}/repos/dnf-ci-fedora-updates/x86_64/wget-1.19.6-5.fc29.x86_64.rpm" @@ -241,7 +232,6 @@ Scenario: Marking installed package when history DB is not on the system (delete | wget-1.19.6-5.fc29.x86_64 | User | -@dnf5 Scenario: Marking toplevel package as dependency should not remove shared dependencies on autoremove Given I use repository "dnf-ci-fedora" When I execute dnf with args "install nss_hesiod libnsl" diff --git a/dnf-behave-tests/dnf/metadata.feature b/dnf-behave-tests/dnf/metadata.feature index 73c3a8708..bcd9a3ec7 100644 --- a/dnf-behave-tests/dnf/metadata.feature +++ b/dnf-behave-tests/dnf/metadata.feature @@ -1,6 +1,7 @@ +@dnf5 Feature: Testing DNF metadata handling -@dnf5 + @bz1644283 Scenario: update expired metadata on first dnf update Given I create directory "/temp-repos/temp-repo" @@ -26,7 +27,6 @@ Given I copy directory "{context.scenario.repos_location}/dnf-ci-fedora" to "/te And stdout contains "\s+wget.src\s+1.19.5-5.fc29\s+testrepo" -@dnf5 @bz1866505 Scenario: I cannot create/overwrite a file in /etc from local repository # This directory structure is needed at the repo source so that it can be matched on the system running dnf @@ -49,7 +49,6 @@ Given I create file "/a/etc/malicious.file" with Then file "/etc/malicious.file" does not exist -@dnf5 @bz1866505 Scenario: I cannot create/overwrite a file in /etc from remote repository Given I create file "/a/etc/malicious.file" with @@ -74,8 +73,6 @@ Given I create file "/a/etc/malicious.file" with Then file "/etc/malicious.file" does not exist -# @dnf5 -# TODO(nsella) different stdout Scenario: present user understandable message when there is a mismatch between available repodata and packages Given I copy repository "simple-base" for modification And I use repository "simple-base" as http diff --git a/dnf-behave-tests/dnf/obsoletes.feature b/dnf-behave-tests/dnf/obsoletes.feature index 54277f9f3..ed084bb76 100644 --- a/dnf-behave-tests/dnf/obsoletes.feature +++ b/dnf-behave-tests/dnf/obsoletes.feature @@ -1,3 +1,4 @@ +@dnf5 Feature: Obsoleted packages # dnf-ci-obsoletes repo contains: @@ -9,7 +10,6 @@ Background: Use dnf-ci-obsoletes repository Given I use repository "dnf-ci-obsoletes" -@dnf5 # PackageE has a split in its upgrade-path, PackageA-Obsoleter-1.0-1 obsoletes # non-best version of PackageE < 2 @bz1902279 @@ -27,7 +27,6 @@ Scenario: Install obsoleted package, even though obsoleter of older version is p | Install | PackageE-0:3.0-1.x86_64 | User | dnf-ci-obsoletes | -@dnf5 Scenario: Install alphabetically first of obsoleters when installing obsoleted package When I execute dnf with args "install PackageF" Then the exit code is 0 @@ -36,7 +35,6 @@ Scenario: Install alphabetically first of obsoleters when installing obsoleted p | install | PackageF-Obsoleter-0:3.0-1.x86_64 | -@dnf5 Scenario: Upgrade a package with multiple obsoleters will install all of them Given I execute dnf with args "install PackageF-1.0" Then the exit code is 0 @@ -51,15 +49,13 @@ Scenario: Upgrade a package with multiple obsoleters will install all of them | install | PackageF-Obsoleter-Second-0:3.0-1.x86_64 | | obsoleted | PackageF-0:1.0-1.x86_64 | -# @dnf5 -# TODO(nsella) different exit code + Scenario: Do not install of obsoleting package using upgrade command, when obsoleted package not on the system When I execute dnf with args "upgrade PackageA-Obsoleter" Then the exit code is 1 And Transaction is empty -@dnf5 @bz1818118 Scenario: Install of obsoleting package using upgrade command, when obsoleted package on the system Given I execute dnf with args "install PackageE-0:1.0-1.x86_64" @@ -101,7 +97,7 @@ Scenario: Obsoleting a package that was installed via rpm, with --best | Install | PackageB-Obsoleter-0:1.0-1.x86_64 | External User | dnf-ci-obsoletes | | Replaced | PackageB-0:1.0-1.x86_64 | External User | @System | -@dnf5 + Scenario: Obsoleting a package that was installed via rpm, with --nobest When I execute rpm with args "-i --nodeps {context.scenario.repos_location}/dnf-ci-obsoletes/x86_64/PackageB-1.0-1.x86_64.rpm" Then the exit code is 0 @@ -119,7 +115,7 @@ Scenario: Obsoleting a package that was installed via rpm, with --nobest | Install | PackageB-Obsoleter-0:1.0-1.x86_64 | External User | dnf-ci-obsoletes | | Replaced | PackageB-0:1.0-1.x86_64 | External User | @System | -@dnf5 + @bz1818118 Scenario: Install of obsoleting package from commandline using upgrade command, when obsoleted package on the system Given I execute dnf with args "install PackageE-0:1.0-1.x86_64" @@ -141,7 +137,7 @@ Scenario: Install of obsoleting package from commandline using upgrade command, | Install | PackageA-Obsoleter-0:1.0-1.x86_64 | User | @commandline | | Replaced | PackageE-0:1.0-1.x86_64 | User | @System | -@dnf5 + Scenario: Upgrade of obsoleted package by package of higher version than obsoleted When I execute dnf with args "install PackageA-1.0" Then the exit code is 0 @@ -162,7 +158,6 @@ Scenario: Upgrade of obsoleted package by package of higher version than obsolet | Replaced | PackageA-0:1.0-1.x86_64 | User | @System | -@dnf5 Scenario: Install of obsoleted package When I execute dnf with args "install PackageB" Then the exit code is 0 @@ -177,7 +172,6 @@ Scenario: Install of obsoleted package | Install | PackageB-Obsoleter-0:1.0-1.x86_64 | User | dnf-ci-obsoletes | -@dnf5 Scenario: Upgrade of obsoleted package When I execute dnf with args "install PackageB-1.0" Then the exit code is 0 @@ -199,7 +193,6 @@ Scenario: Upgrade of obsoleted package | Replaced | PackageB-0:1.0-1.x86_64 | User | @System | -@dnf5 Scenario: Upgrade of obsoleted package if package specified by version with glob (no obsoletes applied) When I execute dnf with args "install PackageB-1.0" Then the exit code is 0 @@ -242,7 +235,6 @@ Scenario: Keep reason of obsoleted package | PackageB-Obsoleter-1.0-1.x86_64 | Dependency | dnf-ci-obsoletes | -@dnf5 Scenario: Autoremoval of obsoleted package When I execute dnf with args "install PackageB-1.0" Then the exit code is 0 @@ -291,7 +283,6 @@ Scenario: Multilib obsoletes during distro-sync | Replaced | lz4-0:1.7.5-2.fc26.i686 | User | @System | -@dnf5 # PackageD-0:2.0-1.x86_64 obsoletes PackageC < 2 # PackageD-0:1.0-1.x86_64 does not obsolete anything @bz1761137 @@ -308,7 +299,6 @@ Scenario: Obsoleted package is not installed when group contains both obsoleter """ -@dnf5 @bz1761137 Scenario: Both packages are installed when group contains both obsoleter and obsoleted packages and obsoletes are switched off When I execute dnf with args "group install obsoleter-obsoleted --setopt=obsoletes=False" diff --git a/dnf-behave-tests/dnf/proxy-username-password.feature b/dnf-behave-tests/dnf/proxy-username-password.feature index 19ef76d6b..6a2bf4123 100644 --- a/dnf-behave-tests/dnf/proxy-username-password.feature +++ b/dnf-behave-tests/dnf/proxy-username-password.feature @@ -1,3 +1,4 @@ +@dnf5 Feature: Accesing a proxy via proxy credentials username and password # it just tests whether the proxy credentials are passed correctly # URL of the test repo intentionally does not exist and so repoquery @@ -5,7 +6,6 @@ Feature: Accesing a proxy via proxy credentials username and password # dXNlcjoxMjM0NTY= is a base64 representation of user:123456 -@dnf5 Scenario: I can store proxy credentials in a repo config Given I copy repository "simple-base" for modification And I start http server "http_server" at "/{context.dnf.repos[simple-base].path}" @@ -28,7 +28,6 @@ Scenario: I can store proxy credentials in a repo config | Proxy-Authorization | Basic dXNlcjoxMjM0NTY= | -@dnf5 Scenario: I can store proxy credentials in dnf.conf Given I copy repository "simple-base" for modification And I start http server "http_server" at "/{context.dnf.repos[simple-base].path}"