Merge of session test fix from 2_5 branch. ObjectManager._delObject() can

throw either AttributeError or KeyError; catch either.

Merge of session test fix from 2_5 branch. ObjectManager._delObject() can
throw either AttributeError or KeyError; catch either.
ffa14fd7 · Shane Hathaway · bd54644f · ffa14fd7
Commit ffa14fd7 authored Sep 12, 2002 by Shane Hathaway
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

lib/python/Products/Sessions/tests/testSessionDataManager.py lib/python/Products/Sessions/tests/testSessionDataManager.py +4 -4

No files found.
--- a/lib/python/Products/Sessions/tests/testSessionDataManager.py
+++ b/lib/python/Products/Sessions/tests/testSessionDataManager.py
@@ -72,16 +72,16 @@ def _populate(app):
        requestName='TESTOFSESSION')

    try: app._delObject(idmgr_name)
-    except AttributeError: pass
+    except (AttributeError, KeyError): pass

    try: app._delObject(tf_name)
-    except AttributeError: pass
+    except (AttributeError, KeyError): pass

    try: app._delObject(sdm_name)
-    except AttributeError: pass
+    except (AttributeError, KeyError): pass

    try: app._delObject('index_html')
-    except AttributeError: pass
+    except (AttributeError, KeyError): pass

    app._setObject(idmgr_name, bidmgr)