From 3cb31205c9fcd7b1d6ddab34c600967b45a1a6ca Mon Sep 17 00:00:00 2001 From: Hao Yu Date: Mon, 29 Jun 2020 19:15:40 +1000 Subject: [PATCH] Remove missing should also remove missing srpms closes #7047 https://pulp.plan.io/issues/7047 --- plugins/pulp_rpm/plugins/importers/yum/purge.py | 1 + .../test/unit/plugins/importers/yum/test_purge.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/plugins/pulp_rpm/plugins/importers/yum/purge.py b/plugins/pulp_rpm/plugins/importers/yum/purge.py index 0ee2f8102..a131e8f0a 100644 --- a/plugins/pulp_rpm/plugins/importers/yum/purge.py +++ b/plugins/pulp_rpm/plugins/importers/yum/purge.py @@ -104,6 +104,7 @@ def remove_missing_rpms(metadata_files, conduit, catalog): remote_named_tuples = get_remote_units(file_function, primary.PACKAGE_TAG, primary.process_package_element) remove_missing_units(conduit, models.RPM, remote_named_tuples, catalog) + remove_missing_units(conduit, models.SRPM, remote_named_tuples, catalog) def remove_missing_drpms(metadata_files, conduit, catalog): diff --git a/plugins/test/unit/plugins/importers/yum/test_purge.py b/plugins/test/unit/plugins/importers/yum/test_purge.py index 42f08e663..0b84df167 100644 --- a/plugins/test/unit/plugins/importers/yum/test_purge.py +++ b/plugins/test/unit/plugins/importers/yum/test_purge.py @@ -63,11 +63,14 @@ def test_remove_missing_rpms(self, mock_remove, mock_get_remote_units): mock_get_remote_units.assert_called_once_with(ANY, primary.PACKAGE_TAG, primary.process_package_element) - mock_remove.assert_called_once_with( - self.conduit, - models.RPM, - mock_get_remote_units.return_value, - catalog) + + mock_remote_units = mock_get_remote_units.return_value + calls = [ + mock.call(self.conduit, models.RPM, mock_remote_units, catalog), + mock.call(self.conduit, models.SRPM, mock_remote_units, catalog) + ] + self.assertEquals(mock_remove.call_count, 2) + mock_remove.assert_has_calls(calls) @mock.patch.object(purge, 'get_remote_units', autospec=True) @mock.patch.object(purge, 'remove_missing_units', autospec=True)