Merge pull request rpm-software-management#1485 from rpm-software-management/fix-check-multiple-dependencies

TagsCheck: Reorder is_devel and is_source parameters

Author: danigm

rpmlint/checks/TagsCheck.py

@@ -296,14 +296,14 @@ def _check_no_epoch_in_tags(self, pkg):
                     self.output.add_info('W', pkg, f'no-epoch-in-{tag}',
                                          Pkg.formatRequire(*x))
 
-    def _check_multiple_dependencies(self, pkg, deps, is_source, is_devel):
+    def _check_multiple_dependencies(self, pkg, deps, is_devel, is_source):
         """Contain multiple check, no-epoch-in-dependency, invalid-dependency,
         invalid-build-requires, devel-dependency, explicit-devel-dependency
 
         Args:
             deps: Variable to find PreReq and Requires tag
-            is_source: Variable to check if a package is of source type
             is_devel: The param to check if a package name ends with *-devel
+            is_source: Variable to check if a package is of source type
 
         Returns:
             Output info to STDOUT

rpmlint/pkg.py

@@ -973,6 +973,23 @@ def add_header(self, header):
 
         self.req_names = [x[0] for x in self.requires + self.prereq]
 
+    def add_dependency(self, dep):
+        name, flags, version = parse_deps(dep)[0]
+        version = versionToString(version)
+        self.header[rpm.RPMTAG_REQUIRESNAME].append(name)
+        self.header[rpm.RPMTAG_REQUIRESFLAGS].append(flags)
+        self.header[rpm.RPMTAG_REQUIRESVERSION].append(version)
+
+        _requires = []
+        _prereq = []
+        self.requires, self.prereq = self._gather_aux(self.header, _requires,
+                                                      rpm.RPMTAG_REQUIRENAME,
+                                                      rpm.RPMTAG_REQUIREFLAGS,
+                                                      rpm.RPMTAG_REQUIREVERSION,
+                                                      _prereq)
+
+        self.req_names = [x[0] for x in self.requires + self.prereq]
+
     def add_symlink_to(self, name, target):
         """
         Add symlink to name file which path is related to name.

test/mockdata/mock_tags.py

@@ -143,3 +143,26 @@
         'license': 'GPL-2.0+ WITH 389-exception',
     },
 )
+
+
+DepsPackage = get_tested_mock_package(
+    lazyload=True,
+    name='pkg',
+    header={
+        'requires': [
+            'expat-devel',
+            'libexplicit',
+        ],
+        'ARCH': 'noarch',
+        'NAME': 'pkg',
+        'VERSION': '5.6.3',
+        'RELEASE': '2.fc39',
+        'EPOCH': 1,
+    },
+)
+
+
+DepsDevPackage = DepsPackage.clone(
+    extend=True,
+    name='pkg-devel',
+)

test/test_tags.py

@@ -1,4 +1,6 @@
 from mockdata.mock_tags import (
+    DepsDevPackage,
+    DepsPackage,
     FooDevelPackage,
     FuseCommonPackage,
     InvalidExceptionPackage,
@@ -499,3 +501,39 @@ def test_missing_dependency_on_with_epoch(package, output, test):
     test.check(package)
     out = output.print_results(output.results)
     assert 'W: missing-dependency-on' not in out
+
+
+@pytest.mark.parametrize('package,should_fail', [
+    [DepsPackage, True],
+    [DepsDevPackage, False],
+])
+def test_devel_dependency(package, should_fail, output, test):
+    test.check(package)
+    out = output.print_results(output.results)
+    assert ('devel-dependency' in out) == should_fail
+
+
+@pytest.mark.parametrize('package,should_fail', [
+    [DepsPackage, True],
+    [DepsDevPackage, False],
+])
+def test_explicit_lib_dependency(package, should_fail, output, test):
+    test.check(package)
+    out = output.print_results(output.results)
+    assert ('explicit-lib-dependency' in out) == should_fail
+
+
+@pytest.mark.parametrize('package,deps,should_fail', [
+    [DepsPackage, ('libxx2_2-devel', ), True],
+    [DepsPackage, ('libxx-devel', 'libxx2-devel'), True],
+    [DepsPackage, ('libxx2', 'libxx-devel'), False],
+])
+def test_invalid_build_requires(package, deps, should_fail, output, test):
+    pkg = package.clone()
+    pkg.is_source = True
+    pkg.requires = []
+    for dep in deps:
+        pkg.requires.append([dep, None, None])
+    test.check(pkg)
+    out = output.print_results(output.results)
+    assert ('invalid-build-requires' in out) == should_fail