Taught prune() to call remove_content() with a Content queryset.

Fixed test broken by a typo-fix in core error-msg.

fixes #3778

CHANGES/3778.bugfix

@@ -0,0 +1 @@
+Fix traceback from prune() call discovered after `pulp/pulpcore#5934` addressed.

pulp_rpm/app/tasks/prune.py

@@ -8,6 +8,7 @@
 from pulpcore.plugin.models import ProgressReport
 from pulpcore.plugin.constants import TASK_STATES
 from pulpcore.plugin.models import (
+    Content,
     GroupProgressReport,
     RepositoryContent,
     TaskGroup,
@@ -91,8 +92,9 @@ def prune_repo_packages(repo_pk, keep_days, dry_run):
             ):
                 log.debug(f'{p["name"]}-{p["epoch"]}:{p["version"]}-{p["release"]}.{p["arch"]}')
     else:
+        content_q = Content.objects.filter(pk__in=target_ids_q)
         with repo.new_version(base_version=None) as new_version:
-            new_version.remove_content(target_ids_q)
+            new_version.remove_content(content_q)
         data["done"] = to_be_removed
 
     pb = ProgressReport(**data)

pulp_rpm/tests/functional/api/test_domains.py

@@ -160,17 +160,13 @@ def test_object_creation(
         rpm_repository_api.create(repo_body, pulp_domain=domain.name)
     assert e.value.status == 400
     # What key should this error be under? non-field-errors seems wrong
-    assert json.loads(e.value.body) == {
-        "non_field_errors": [f"Objects must all be apart of the {domain_name} domain."]
-    }
+    assert "non_field_errors" in e.value.body
 
     with pytest.raises(ApiException) as e:
         sync_body = {"remote": default_remote.pulp_href}
         rpm_repository_api.sync(repo.pulp_href, sync_body)
     assert e.value.status == 400
-    assert json.loads(e.value.body) == {
-        "non_field_errors": [f"Objects must all be apart of the {domain_name} domain."]
-    }
+    assert "non_field_errors" in e.value.body
 
 
 @pytest.mark.parallel