Merge pull request #11417 from archesproject/jtw/fix-noisy-test

Fix noisy test
archesproject · Aug 31, 2024 · f6ee7be · f6ee7be
2 parents 3449318 + 415fa2f
commit f6ee7be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tests/permissions/permission_tests.py b/tests/permissions/permission_tests.py
@@ -151,10 +151,13 @@ def test_user_has_resource_model_permissions(self):
         resource = ResourceInstance.objects.get(
             resourceinstanceid=self.resource_instance_id
         )
-        nodes = Node.objects.filter(graph_id=resource.graph_id)
+        nodes = (
+            Node.objects.filter(graph_id=resource.graph_id)
+            .exclude(nodegroup__isnull=True)
+            .select_related("nodegroup")
+        )
         for node in nodes:
-            if node.nodegroup:
-                assign_perm("no_access_to_nodegroup", self.group, node.nodegroup)
+            assign_perm("no_access_to_nodegroup", self.group, node.nodegroup)
         hasperms = user_has_resource_model_permissions(
             self.user, ["models.read_nodegroup"], resource
         )

diff --git a/tests/views/search_tests.py b/tests/views/search_tests.py
@@ -804,7 +804,8 @@ def test_search_with_bad_searchview(self):
 
         """
         query = {"search-view": "unavailable-search-view"}
-        response_json = get_response_json(self.client, query=query)
+        with self.assertLogs("django.request", level="WARNING"):
+            response_json = get_response_json(self.client, query=query)
         self.assertFalse(response_json["success"])
 
     def test_searchview_searchview_component_from_admin(self):