Merge branch 'master' into linkintegrity-items-total

plone · Aug 23, 2023 · e0e0526 · e0e0526
2 parents 83d5ed3 + ed070e0
commit e0e0526
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/news/1680.internal b/news/1680.internal
@@ -0,0 +1 @@
+Fix test cleanup. @davisagli
diff --git a/src/plone/restapi/tests/test_content_utils.py b/src/plone/restapi/tests/test_content_utils.py
@@ -92,9 +92,10 @@ def move_object(event):
 
         sm.registerHandler(move_object, (IObjectAddedEvent,))
 
-        obj = create(self.folder, "Document", "my-document")
-        notify(ObjectCreatedEvent(obj))
-        obj = add(self.folder, obj)
-        self.assertEqual(aq_parent(obj), self.portal)
-
-        sm.unregisterHandler(move_object, (IObjectAddedEvent,))
+        try:
+            obj = create(self.folder, "Document", "my-document")
+            notify(ObjectCreatedEvent(obj))
+            obj = add(self.folder, obj)
+            self.assertEqual(aq_parent(obj), self.portal)
+        finally:
+            sm.unregisterHandler(move_object, (IObjectAddedEvent,))