Annotate e-g features and simplify tags

rpm-software-management · Oct 22, 2024 · 9005ec0 · 9005ec0
1 parent c615c86
commit 9005ec0
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/dnf-behave-tests/dnf/error_messages.feature b/dnf-behave-tests/dnf/error_messages.feature
@@ -1,8 +1,10 @@
+@dnf5
 Feature: Test error messages
 
 
-# @dnf5
-# TODO(nsella) different stderr
+@xfail
+# reported as
+# https://github.com/rpm-software-management/dnf5/issues/1003
 @bz1888946
 Scenario: Global option 'proxy_username' is set but not 'proxy_password'
   Given I use repository "dnf-ci-fedora"
@@ -15,8 +17,9 @@ Scenario: Global option 'proxy_username' is set but not 'proxy_password'
     And stderr contains "'proxy_username' is set but not 'proxy_password'"
 
 
-# @dnf5
-# TODO(nsella) different stderr
+@xfail
+# reported as
+# https://github.com/rpm-software-management/dnf5/issues/1003
 @bz1888946
 Scenario: Repository option 'proxy_username' is set but not 'proxy_password'
   Given I use repository "dnf-ci-fedora" with configuration

diff --git a/dnf-behave-tests/dnf/exclude_from_weak.feature b/dnf-behave-tests/dnf/exclude_from_weak.feature
@@ -1,7 +1,7 @@
+@dnf5
 Feature: Skip exclude_from_weak for weak deps and autodetected exclude_from_weak for unmet weak dependencies of installed packages
 
 
-@dnf5
 Scenario: Install step also installs weak deps
   Given I use repository "dnf-ci-fedora"
    When I execute dnf with args "install abcde"
@@ -18,7 +18,6 @@ Scenario: Install step also installs weak deps
         | Action        | Package                                   |
         | upgrade       | abcde-0:2.9.3-1.fc29.noarch               |
 
-@dnf5
 @bz2005305
 @bz1699672
 Scenario: Install without weak dependencies, upgrades ignores unmet weak dependencies of installed packages
@@ -42,7 +41,6 @@ Scenario: Install without weak dependencies, upgrades ignores unmet weak depende
         | Action      | Package                                 |
         | install     | flac-0:1.3.3-3.fc29.x86_64              |
 
-@dnf5
 @bz2005305
 @bz1699672
 Scenario: Install exclude_from_weak package
@@ -65,7 +63,6 @@ Scenario: Install exclude_from_weak package
         | Action        | Package                                  |
         | install       | flac-0:1.3.3-3.fc29.x86_64               |
 
-@dnf5
 @bz2005305
 @bz1699672
 Scenario: Obsoletes are not disabled by exclude_from_weak
@@ -83,7 +80,6 @@ Scenario: Obsoletes are not disabled by exclude_from_weak
         | obsoleted     | PackageB-0:1.0-1.x86_64                   |
 
 
-@dnf5
 @bz1699672
 @bz2005305
 Scenario: Upgrade ignores unmet weak dependencies of installed packages even when specified as a new dependency (different version + rich dep)
@@ -100,7 +96,6 @@ Scenario: Upgrade ignores unmet weak dependencies of installed packages even whe
         | upgrade       | PackageA-2.0-1.x86_64                     |
 
 
-@dnf5
 @bz1699672
 @bz2005305
 Scenario: Upgrades won't install supplementing package when excluded from weak before
@@ -117,7 +112,6 @@ Scenario: Upgrades won't install supplementing package when excluded from weak b
         | upgrade       | PackageB-2.0-1.x86_64                     |
 
 
-@dnf5
 @bz1699672
 @bz2005305
 Scenario: Upgrades installs supplementing package when new version is supplemented
@@ -135,7 +129,6 @@ Scenario: Upgrades installs supplementing package when new version is supplement
         | install-weak  | supplementing-pkg-versioned-2.0-1.x86_64  |
 
 
-@dnf5
 @bz1699672
 @bz2005305
 Scenario: Upgrade ignores unmet recommends of installed package even when another package recommends it
@@ -152,7 +145,6 @@ Scenario: Upgrade ignores unmet recommends of installed package even when anothe
         | upgrade       | PackageA-2.0-1.x86_64                     |
         | install       | PackageC-2.0-1.x86_64                     |
 
-@dnf5
 @bz2048394
 @bz2033130
 Scenario: Upgrade will not ignores unmet recommends of installed package when the rich dependency was satisfied

diff --git a/dnf-behave-tests/dnf/fail-safe-cache.feature b/dnf-behave-tests/dnf/fail-safe-cache.feature
@@ -1,3 +1,5 @@
+# @dnf5
+# missing modularity features: https://github.com/rpm-software-management/dnf5/issues/146
 Feature: Tests for the correct creation and usage of the modulefailsafe file
 
 

diff --git a/dnf-behave-tests/dnf/fail-safe.feature b/dnf-behave-tests/dnf/fail-safe.feature
@@ -1,3 +1,5 @@
+# @dnf5
+# missing modularity features: https://github.com/rpm-software-management/dnf5/issues/146
 Feature: Fail-safe
 
 

diff --git a/dnf-behave-tests/dnf/gpg.feature b/dnf-behave-tests/dnf/gpg.feature
@@ -1,3 +1,4 @@
+@dnf5
 Feature: Testing gpgcheck
 
 
@@ -29,7 +30,6 @@ Background: Add repository with gpgcheck=1
    Then the exit code is 1
 
 
-@dnf5
 @dnf5daemon
 Scenario Outline: Install <offline> masterkey signed package and check GPG key was imported
    When I execute dnf with args "install <offline> setup"
@@ -49,7 +49,6 @@ Examples:
     | --offline     | DNF Transaction   |
 
 
-@dnf5
 @dnf5daemon
 Scenario Outline: Install <offline> subkey signed package with masterkey signed dependency
    When I execute dnf with args "install <offline> filesystem"
@@ -69,7 +68,6 @@ Examples:
     | --offline     | DNF Transaction   |
 
 
-@dnf5
 # XXX stderr @dnf5daemon
 Scenario Outline: Fail to <offline> install signed package with incorrectly signed dependency (with key from different repository)
    When I execute dnf with args "install <offline> glibc"
@@ -95,7 +93,6 @@ Examples:
     | --offline     |
 
 
-@dnf5
 # XXX stderr @dnf5daemon
 Scenario Outline: Fail to <offline> install signed package with incorrect checksum
    When I execute dnf with args "install <offline> broken-package"
@@ -116,7 +113,6 @@ Examples:
     | --offline     |
 
 
-@dnf5
 @dnf5daemon
 Scenario Outline: Install <offline> masterkey signed, unsigned and masterkey signed with unknown key packages from repo with gpgcheck=0 in repofile
   Given I configure repository "dnf-ci-gpg" with
@@ -139,7 +135,6 @@ Examples:
     | --offline     |
 
 
-@dnf5
 # XXX stderr @dnf5daemon
 Scenario Outline: Attempt to <offline> install unsigned package from repo with gpgcheck=1
    When I execute dnf with args "install <offline> flac"
@@ -156,7 +151,6 @@ Examples:
     | --offline     |
 
 
-@dnf5
 Scenario Outline: Install <offline> unsigned package from repository without gpgcheck set using option --no-gpgchecks
    When I execute dnf with args "install <offline> flac --no-gpgchecks"
    Then the exit code is 0
@@ -170,7 +164,6 @@ Examples:
     | --offline     | DNF Transaction   |
 
 
-@dnf5
 @bz1314405
 Scenario Outline: Fail to <offline> install package with incorrect checksum with --no-gpgchecks
   Given I configure repository "dnf-ci-gpg" with
@@ -191,7 +184,6 @@ Examples:
     | --offline     |
 
 
-@dnf5
 @bz1915990
 @bz1932079
 @bz1932089
@@ -215,6 +207,7 @@ Examples:
 
 
 @xfail
+# Reported as https://github.com/rpm-software-management/dnf5/issues/1790
 @1941959
 Scenario: Expire repo when failed to install package with incorrect checksum
   Given I drop repository "dnf-ci-gpg"
@@ -229,7 +222,11 @@ Scenario: Expire repo when failed to install package with incorrect checksum
         | Action        | Package                               |
         | install       | broken-package-0:0.2.4-1.fc29.noarch  |
     And RPMDB Transaction is empty
-    And file "/var/cache/dnf/expired_repos.json" contents is
-        """
-        ["dnf-ci-gpg"]
-        """
+   # Check that repository dnf-ci-gpg is refreshed on the next run
+   When I execute dnf with args "makecache"
+   Then stderr matches line by line
+   """
+   Updating and loading repositories:
+    dnf-ci-gpg test repository             100% |   .*
+   Repositories loaded.
+   """