Finish dnf5 CI review and cleanup

container-test

@@ -220,6 +220,11 @@ class BehaveRunner(object):
             tags = []
         if hasattr(self.command_line_args, 'noxfail') and self.command_line_args.noxfail:
             tags.append('~xfail')
+        # For a transition period ignore "@dnf5" tag passed on the commandline.
+        # We run dnf5 by default.
+        # TODO(amatej): This could be removed later
+        if "dnf5" in tags:
+            tags.remove("dnf5")
         return tags
 
     def parse_behave_dry_run(self, output):

dnf-behave-tests/common/output.py

@@ -12,17 +12,6 @@
 from common.lib.text import lines_match_to_regexps_line_by_line
 
 
-sync_line_dnf4 = re.compile(r".*[0-9.]+ +[kMG]?B/s \| +[0-9.]+ +[kMG]?B +[0-9]{2}:[0-9]{2}")
-bottom_line_dnf4 = re.compile(r"Last metadata expiration check: .*")
-
-def strip_reposync_dnf4(found_lines, line_number):
-    while line_number < len(found_lines) and sync_line_dnf4.fullmatch(found_lines[line_number].strip()):
-        found_lines.pop(line_number)
-
-    if line_number < len(found_lines) and bottom_line_dnf4.fullmatch(found_lines[line_number].strip()):
-        found_lines.pop(line_number)
-
-
 sync_line_dnf5 = re.compile(
     r".* [0-9?]+% \| +[0-9.]+ +[KMG]?i?B/s \| +[\-0-9.]+ +[KMG]?i?B \| + [0-9hms?]+")
 
@@ -40,14 +29,11 @@ def strip_reposync_dnf5(found_lines, line_number):
     while line_number < len(found_lines) and sync_line_dnf5.fullmatch(found_lines[line_number].strip()):
         found_lines.pop(line_number)
 
-def handle_reposync(expected, found, dnf5_mode):
+def handle_reposync(expected, found):
     line_number = 0
     for line in expected:
         if line == "<REPOSYNC>":
-            if dnf5_mode:
-                strip_reposync_dnf5(found, line_number)
-            else:
-                strip_reposync_dnf4(found, line_number)
+            strip_reposync_dnf5(found, line_number)
 
             expected.pop(line_number)
             break
@@ -83,8 +69,7 @@ def then_stdout_is(context):
     if found == [""]:
         found = []
 
-    dnf5_mode = hasattr(context, "dnf5_mode") and context.dnf5_mode
-    clean_expected, clean_found = handle_reposync(expected, found, dnf5_mode)
+    clean_expected, clean_found = handle_reposync(expected, found)
 
     if clean_expected == clean_found:
         return
@@ -107,12 +92,6 @@ def then_stdout_is(context):
     raise AssertionError("Stdout is not: %s" % context.text)
 
 
-@parse.with_pattern(r"dnf4|dnf5")
-def parse_dnf_version(text):
-    return text
-behave.register_type(dnf_version=parse_dnf_version)
-
-
 @parse.with_pattern(r"stdout|stderr")
 def parse_std_stream(text):
     return text
@@ -128,8 +107,7 @@ def then_stdout_matches_line_by_line(context):
     found = context.cmd_stdout.split('\n')
     expected = context.text.split('\n')
 
-    dnf5_mode = hasattr(context, "dnf5_mode") and context.dnf5_mode
-    clean_expected, clean_found = handle_reposync(expected, found, dnf5_mode)
+    clean_expected, clean_found = handle_reposync(expected, found)
 
     lines_match_to_regexps_line_by_line(clean_found, clean_expected)
 
@@ -155,8 +133,7 @@ def then_stderr_is(context):
     if found == [""]:
         found = []
 
-    dnf5_mode = hasattr(context, "dnf5_mode") and context.dnf5_mode
-    clean_expected, clean_found = handle_reposync(expected, found, dnf5_mode)
+    clean_expected, clean_found = handle_reposync(expected, found)
 
     if clean_expected == clean_found:
         return
@@ -188,98 +165,6 @@ def then_stderr_matches_line_by_line(context):
     found = context.cmd_stderr.split('\n')
     expected = context.text.split('\n')
 
-    dnf5_mode = hasattr(context, "dnf5_mode") and context.dnf5_mode
-    clean_expected, clean_found = handle_reposync(expected, found, dnf5_mode)
+    clean_expected, clean_found = handle_reposync(expected, found)
 
     lines_match_to_regexps_line_by_line(clean_found, clean_expected)
-
-
-@behave.then("{dnf_version:dnf_version} exit code is {exitcode}")
-def then_dnf_exit_code_is(context, dnf_version, exitcode):
-    """
-    Check for the test's exit code only if running in the
-    appropriate mode otherwise the step is skipped
-    Produce the steps:
-        then dnf4 exit code is
-        then dnf5 exit code is
-    """
-    dnf5_mode = hasattr(context, "dnf5_mode") and context.dnf5_mode
-    if dnf_version == "dnf5" and dnf5_mode:
-        then_the_exit_code_is(context, exitcode)
-    if dnf_version == "dnf4" and not dnf5_mode:
-        then_the_exit_code_is(context, exitcode)
-
-
-@behave.then("{dnf_version:dnf_version} {std_stream:std_stream} is")
-def then_dnf_stream_is(context, dnf_version, std_stream):
-    """
-    Check for exact match of the test's stdout/stderr
-    only if running in the appropriate mode otherwise
-    the step is skipped.
-    Produce the steps:
-        then dnf4 stdout is
-        then dnf4 stderr is
-        then dnf5 stderr is
-        then dnf5 stdout is
-    """
-    if std_stream == "stdout":
-        then_stream_is = then_stdout_is
-    if std_stream == "stderr":
-        then_stream_is = then_stderr_is
-
-    dnf5_mode = hasattr(context, "dnf5_mode") and context.dnf5_mode
-    if dnf_version == "dnf5" and dnf5_mode:
-        then_stream_is(context)
-    if dnf_version == "dnf4" and not dnf5_mode:
-        then_stream_is(context)
-
-
-@behave.then("{dnf_version:dnf_version} {std_stream:std_stream} matches line by line")
-def then_dnf_stream_matches_line_by_line(context, dnf_version, std_stream):
-    """
-    Checks that each line of stdout/stderr matches respective
-    line in regular expressions.
-    Supports the <REPOSYNC> in the same way as the step
-    "stdout is"
-    Works only if running in the appropriate mode otherwise
-    the step is skipped.
-    Produce the steps:
-        then dnf4 stdout matches line by line
-        then dnf4 stderr matches line by line
-        then dnf5 stderr matches line by line
-        then dnf5 stdout matches line by line
-    """
-    if std_stream == "stdout":
-        then_stream_matches_line_by_line = then_stdout_matches_line_by_line
-    if std_stream == "stderr":
-        then_stream_matches_line_by_line = then_stderr_matches_line_by_line
-
-    dnf5_mode = hasattr(context, "dnf5_mode") and context.dnf5_mode
-    if dnf_version == "dnf5" and dnf5_mode:
-        then_stream_matches_line_by_line(context)
-    if dnf_version == "dnf4" and not dnf5_mode:
-        then_stream_matches_line_by_line(context)
-
-
-@behave.then("{dnf_version:dnf_version} {std_stream:std_stream} is empty")
-def then_dnf_stream_is_empty(context, dnf_version, std_stream):
-    """
-    Check that stdout/stderr is empty
-    Works only if running in the appropriate mode otherwise
-    the step is skipped
-    Produce the steps:
-        then dnf4 stdout is empty
-        then dnf4 stderr is empty
-        then dnf5 stdout is empty
-        then dnf5 stderr is empty
-    """
-    if std_stream == "stdout":
-        then_stream_is_empty = then_stdout_is_empty
-    if std_stream == "stderr":
-        then_stream_is_empty = then_stderr_is_empty
-
-    dnf5_mode = hasattr(context, "dnf5_mode") and context.dnf5_mode
-    if dnf_version == "dnf5" and dnf5_mode:
-        then_stream_is_empty(context)
-    if dnf_version == "dnf4" and not dnf5_mode:
-        then_stream_is_empty(context)

dnf-behave-tests/dnf/aliases.feature

@@ -1,6 +1,5 @@
 # aliases configuration directories are always taken from the host
 @destructive
-@dnf5
 Feature: Test for dnf5 aliases functionality
 
 Background:

dnf-behave-tests/dnf/api/package-query.feature

@@ -1,4 +1,3 @@
-@dnf5
 @not.with_dnf=4
 Feature: api: query packages
 

dnf-behave-tests/dnf/api/package.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: api: package
 
 

dnf-behave-tests/dnf/api/repo-query.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: api: query repos
 
 

dnf-behave-tests/dnf/api/transaction-remove-install.feature

@@ -1,4 +1,3 @@
-@dnf5
 @not.with_dnf=4
 Feature: transaction: remove a package with dependency, then install the dependency again
 

dnf-behave-tests/dnf/api/transaction-simple-install.feature

@@ -1,4 +1,3 @@
-@dnf5
 @not.with_dnf=4
 Feature: transaction: install a package without dependencies
 

dnf-behave-tests/dnf/api/transaction-test.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: transaction: dry-run a transaction
 
 

dnf-behave-tests/dnf/api/transaction-upgrade-downgrade.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: transaction: upgrades and downgrades
 
 Background: Install RPMs

dnf-behave-tests/dnf/append_options.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: DNF test of append option
 
 # The excludepks append option was choosen for testing.

dnf-behave-tests/dnf/autoremove.feature

@@ -1,6 +1,5 @@
 Feature: Autoremoval of unneeded packages
 
-@dnf5
 Scenario: Autoremoval of package which became non-required by others
   Given I use repository "dnf-ci-fedora"
     And I use repository "dnf-ci-thirdparty"

dnf-behave-tests/dnf/broken-dependencies-report.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Reporting broken dependencies with various strict, best options
 
 

dnf-behave-tests/dnf/cache.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Tests for cache
 
 

dnf-behave-tests/dnf/cacheonly.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Tests for cacheonly functionality
 
 

dnf-behave-tests/dnf/check-all.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Check when there are multiple problems
 
 

dnf-behave-tests/dnf/check-dependencies.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Check when there is a package with missing dependency
 
 

dnf-behave-tests/dnf/check-duplicates.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Check when there are duplicate packages
 
 

dnf-behave-tests/dnf/check-no-problem.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Check when there is no problem
 
 

dnf-behave-tests/dnf/check-obsoleted.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Check when there is a package that obsoletes another installed package
 
 

dnf-behave-tests/dnf/check-update.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: check-upgrade commands
 
 @bz1769466

dnf-behave-tests/dnf/clean-cachefiles.feature

@@ -1,4 +1,3 @@
-@dnf5
 @dnf5daemon
 Feature: Testing that dnf clean command removes files from the cache
 

dnf-behave-tests/dnf/clean-requirements-on-remove.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Autoremoval of unneeded packages
 
 Scenario: Remove with --setopt=clean_requirements_on_remove=True

dnf-behave-tests/dnf/clean.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Testing dnf clean command
 
 

dnf-behave-tests/dnf/command-aliases.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Tests for command aliases availability
 
 

dnf-behave-tests/dnf/comps-group-disabled-repo.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Test group remove when repositories are disabled
 
 Background: Install group DNF-CI-Testgroup

dnf-behave-tests/dnf/comps-group-list.feature

@@ -1,4 +1,3 @@
-@dnf5
 @dnf5daemon
 Feature: Tests for group list and info commands
 

dnf-behave-tests/dnf/comps-group-pkgremove.feature

@@ -1,4 +1,3 @@
-@dnf5
 Feature: Test removal packages along with group
 
 # Self-dependent package is a package that requires and provides the same capability.