Enable history-undo-dependant.feature and history-undo-obsoletes.feature

- Undoing install of dependecies that are not used by anything else is now described as `remove-unused`.
rpm-software-management · Apr 26, 2024 · d02fb04 · d02fb04
1 parent 31629ec
commit d02fb04
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/dnf-behave-tests/dnf/history-undo-dependant.feature b/dnf-behave-tests/dnf/history-undo-dependant.feature
@@ -1,21 +1,21 @@
+@dnf5
 Feature: Transaction history undo
 
 @bz1700529
 Scenario: Undo module install with dependent userinstalled package
   Given I use repository "dnf-ci-fedora"
     And I use repository "dnf-ci-fedora-modular"
    # install module that contains postgresql-server
-   When I execute dnf with args "module install postgresql/server"
-   Then the exit code is 0
-    And Transaction contains
-        | Action                    | Package                                       |
-        | install-group             | postgresql-server-0:9.6.8-1.module_1710+b535a823.x86_64 |
+    And I successfully execute dnf with args "module enable postgresql/server"
+    And I successfully execute dnf with args "install postgresql-server-0:9.6.8-1.module_1710+b535a823.x86_64"
    # install package, that requires postgresql-server
-   When I execute dnf with args "install postgresql-test"
-   Then the exit code is 0
+    And I successfully execute dnf with args "install postgresql-test"
    # try to undo module install transaction
    When I execute dnf with args "history undo last-1"
    # the transaction is not supposed to reinstall required packages, but to fail
    Then the exit code is 1
-    And stdout does not contain "Reinstalling\s+: postgresql-server-9\.6\.8-1\.module_1710\+b535a823"
+    And stdout is
+    """
+    <REPOSYNC>
+    """
     And stderr contains "package postgresql-test-9\.6\.8-1\.module_1710\+b535a823\.x86_64 requires postgresql-server\(x86-64\) = 9\.6\.8-1\.module_1710\+b535a823, but none of the providers can be installed"
diff --git a/dnf-behave-tests/dnf/history-undo-obsoletes.feature b/dnf-behave-tests/dnf/history-undo-obsoletes.feature
@@ -1,3 +1,4 @@
+@dnf5
 Feature: Transaction history undo with obsoletes
 
 # Package glibc-all-langpacks requires glibc
@@ -30,10 +31,10 @@ Scenario: Undo with obsoletes
     And Transaction is following
         | Action        | Package                                   |
         | remove        | glibc-all-langpacks-0:2.28-9.fc29.x86_64  |
-        | remove-dep    | setup-0:2.12.1-1.fc29.noarch              |
+        | remove-unused | setup-0:2.12.1-1.fc29.noarch              |
         | remove        | glibc-0:2.28-9.fc29.x86_64                |
-        | remove-dep    | glibc-common-0:2.28-9.fc29.x86_64         |
-        | remove-dep    | filesystem-0:3.9-2.fc29.x86_64            |
-        | remove-dep    | basesystem-0:11-6.fc29.noarch             |
+        | remove-unused | glibc-common-0:2.28-9.fc29.x86_64         |
+        | remove-unused | filesystem-0:3.9-2.fc29.x86_64            |
+        | remove-unused | basesystem-0:11-6.fc29.noarch             |
         | install       | glibc-profile-0:2.3.1-10.x86_64           |