Merge d9843fb into 6d359fc

release-engineering · Mar 25, 2019 · 8458f24 · 8458f24
2 parents 6d359fc + d9843fb
commit 8458f24
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/tests/test_ubipop.py b/tests/test_ubipop.py
@@ -240,3 +240,36 @@ def test_ubipopulate_load_all_ubiconfig(mocked_ubiconfig_load_all):
     ubipop = UbiPopulate("foo.pulp.com", ('foo', 'foo'), False)
     assert len(ubipop.ubiconfig_list) == 1
     assert ubipop.ubiconfig_list[0] == "test"
+
+
+def test_create_srpms_output_set(mock_ubipop_runner):
+    expected_src_rpm_filename = "tomcatjss-7.3.6-1.el8+1944+b6c8e16f.src.rpm"
+    mock_ubipop_runner.out_repo_set.packages['foo'] = \
+        [get_test_pkg(name="tomcatjss",
+                      filename="tomcatjss-7.3.6-1.el8+1944+b6c8e16f.noarch.rpm"),
+         get_test_pkg(name="kernel",
+                      filename="kernel-7.3.6-1.el8+1944+b6c8e16f.noarch.rpm")
+         ]
+
+    mock_ubipop_runner._create_srpms_output_set()
+    out_srpms = mock_ubipop_runner.out_repo_set.source_rpms
+    assert len(out_srpms) == 1
+    assert out_srpms[0].name == "tomcatjss"
+    assert out_srpms[0].filename == expected_src_rpm_filename
+
+
+def test_create_debug_output_set(mock_ubipop_runner):
+    expected_debug_filename = "tomcatjss-debuginfo-7.3.6-1.el8+1944+b6c8e16f.noarch.rpm"
+    mock_ubipop_runner.out_repo_set.packages['foo'] = \
+        [get_test_pkg(name="tomcatjss",
+                      filename="tomcatjss-7.3.6-1.el8+1944+b6c8e16f.noarch.rpm"),
+         get_test_pkg(name="kernel",
+                      filename="kernel-7.3.6-1.el8+1944+b6c8e16f.noarch.rpm")
+         ]
+
+    mock_ubipop_runner._create_debuginfo_output_set()
+    out_debug_rpms = mock_ubipop_runner.out_repo_set.debug_rpms
+    assert len(out_debug_rpms) == 1
+    assert out_debug_rpms[0].name == "tomcatjss"
+    assert out_debug_rpms[0].filename == expected_debug_filename
+
diff --git a/ubipop/__init__.py b/ubipop/__init__.py
@@ -238,7 +238,8 @@ def _create_srpms_output_set(self):
                                                          package.sourcerpm_filename))
 
         blacklisted = self.get_blacklisted_packages(self.out_repo_set.source_rpms)
-        self._diff_packages_by_filename(self.out_repo_set.source_rpms, blacklisted)
+        self.out_repo_set.source_rpms = \
+            self._diff_packages_by_filename(self.out_repo_set.source_rpms, blacklisted)
 
     def _create_debuginfo_output_set(self):
         """
@@ -254,7 +255,8 @@ def _create_debuginfo_output_set(self):
             self.out_repo_set.debug_rpms.append(Package(name, debug_pkg_filename))
 
         blacklisted = self.get_blacklisted_packages(self.out_repo_set.debug_rpms)
-        self._diff_packages_by_filename(self.out_repo_set.debug_rpms, blacklisted)
+        self.out_repo_set.debug_rpms = \
+            self._diff_packages_by_filename(self.out_repo_set.debug_rpms, blacklisted)
 
     def _determine_pulp_actions(self, current_modules_ft, current_rpms_ft, current_srpms_ft,
                                 current_debug_rpms_ft):