Update and enable tests for transaction replay

dnf-behave-tests/dnf/steps/history.py

@@ -79,60 +79,6 @@ def step_impl(context, history_range=None):
     assert_history_list(context, context.cmd_stdout)
 
 
-#TODO(amatej): This should be removed once the step is no longer used in transaction-sr/replay.feature.
-#              The step is duplicate of 'dnf5 transaction items for transaction "last" are'.
-@behave.then('History info should match')
-@behave.then('History info "{spec}" should match')
-def step_impl(context, spec=None):
-    IN = ['Description',]
-    ACTIONS = [
-        'Install',
-        'Upgrade',
-        'Downgrade',
-        'Reinstall',
-        'Remove',
-        'Replaced',
-        'Reason Change',
-        'Enable',
-        'Disable',
-        'Reset',
-    ]
-
-    check_context_table(context, ["Key", "Value"])
-
-    if spec is None:
-        spec = ""
-    h_info = parsed_history_info(context, spec)
-
-    expected_actions = []
-    for key, value in context.table:
-        if key in h_info:
-            if key in IN and value in h_info[key]:
-                continue
-            elif value == h_info[key]:
-                continue
-            else:
-                raise AssertionError(
-                    '[history] {0} "{1}" not matched by "{2}".'.format(
-                        key, h_info[key], value))
-        elif key in ACTIONS:
-            expected_actions.append([key, value])
-        else:
-            raise AssertionError('[history] key "{0}" not found.'.format(key))
-
-    found_actions = []
-    for a in h_info[None]:
-        action = a.split()
-
-        if action[0:2] == ["Reason", "Change"]:
-            found_actions.append(["Reason Change", action[2]])
-        else:
-            found_actions.append(action[0:2])
-
-    if expected_actions != found_actions:
-        print_lines_diff(expected_actions, found_actions)
-        raise AssertionError("History actions mismatch")
-
 @behave.then('History info rpmdb version changed')
 def step_impl(context, spec=""):
     h_info = parsed_history_info(context, spec)

dnf-behave-tests/dnf/steps/lib/dnf.py

@@ -53,6 +53,7 @@
     "Installing environmental groups": "env-install",
     "Installing Environment Groups": "env-install",
     "Removing Environment Groups": "env-remove",
+    "Removing environmental groups": "env-remove",
     "Upgrading Environment Groups": "env-upgrade",
     "Upgrading environmental groups": "env-upgrade",
     "Installing module profiles": "module-profile-install",
@@ -62,6 +63,7 @@
     "Switching module streams": "module-stream-switch",
     "Disabling modules": "module-disable",
     "Resetting modules": "module-reset",
+    "Changing reason": "changing-reason",
 }
 
 
@@ -305,6 +307,11 @@ def parse_transaction_table_dnf5(context, lines):
             nevra = "{0[name]}-{0[evr]}.{0[arch]}".format(match_dict)
             rpm = RPM(nevra)
             result[result_action].add(rpm)
+            if action == "changing-reason":
+                # Drop line that describes how the reason was changed, eg: User -> Dependency.
+                # Currently we do not record how the reason was changed, it can be checked by
+                # step: "dnf5 transaction items for transaction "last" are"
+                lines.pop(0)
 
     return result
 

dnf-behave-tests/dnf/steps/system_state.py

@@ -71,3 +71,78 @@ def package_state_is(context):
 
     if fail:
         raise AssertionError("System state mismatch")
+
+
+@behave.then('group state is')
+def group_state_is(context):
+    """
+    Checks packages and userinstalled state in groups system state groups.toml.
+    For that, the table in context has to contain group id.
+    """
+    check_context_table(context, ["id", "package_types", "packages", "userinstalled"])
+
+    found_groups = []
+    with open(os.path.join(context.dnf.installroot, "usr/lib/sysimage/libdnf5/groups.toml")) as f:
+        for k, v in toml.load(f)["groups"].items():
+            pkg_types = v["package_types"]
+            pkg_types.sort()
+            pkgs = v["packages"]
+            pkgs.sort()
+            found_groups.append((k, ', '.join(pkg_types), ', '.join(pkgs), str(v["userinstalled"])))
+    found_groups.sort()
+
+    expected_groups = []
+    for group_id, package_types, packages, userinstalled in context.table:
+        p_types = package_types.split(',')
+        p_types = list(map(str.strip, p_types))
+        p_types.sort()
+        p = packages.split(',')
+        p = list(map(str.strip, p))
+        p.sort()
+        expected_groups.append((group_id, ', '.join(p_types), ', '.join(p), str(userinstalled)))
+
+    expected_groups.sort()
+
+    fail = False
+    if expected_groups != found_groups:
+        print("groups.toml system state differs from expected:")
+        print_lines_diff(expected_groups, found_groups)
+        fail = True
+
+    if fail:
+        raise AssertionError("Group system state mismatch")
+
+
+@behave.then('environment state is')
+def environment_state_is(context):
+    """
+    Checks groups in environments system state environments.toml.
+    For that, the table in context has to contain environment id.
+    """
+    check_context_table(context, ["id", "groups"])
+
+    found_environments = []
+    with open(os.path.join(context.dnf.installroot, "usr/lib/sysimage/libdnf5/environments.toml")) as f:
+        for k, v in toml.load(f)["environments"].items():
+            groups = v["groups"]
+            groups.sort()
+            found_environments.append((k, ', '.join(groups)))
+    found_environments.sort()
+
+    expected_environments = []
+    for env_id, groups in context.table:
+        g = groups.split(',')
+        g = list(map(str.strip, g))
+        g.sort()
+        expected_environments.append((env_id, ', '.join(g)))
+
+    expected_environments.sort()
+
+    fail = False
+    if expected_environments != found_environments:
+        print("environments.toml system state differs from expected:")
+        print_lines_diff(expected_environments, found_environments)
+        fail = True
+
+    if fail:
+        raise AssertionError("Environment system state mismatch")

dnf-behave-tests/dnf/steps/transaction.py

@@ -49,7 +49,7 @@ def check_rpmdb_transaction(context, mode):
         if action.startswith("remove-"):
             action = "remove"
 
-        if action in ["broken"] or action in ["conflict"]:
+        if action in ["broken", "conflict", "changing-reason"]:
             continue
         for nevra in nevras.split(", "):
             if action.startswith('group-') or action.startswith('env-') or action.startswith('module-'):