[Zope-Checkins] CVS: Zope/lib/python/Products/Sessions/tests - testSessionDataManager.py:1.9.16.1

Shane Hathaway shane@cvs.zope.org
Wed, 11 Sep 2002 17:42:15 -0400


Update of /cvs-repository/Zope/lib/python/Products/Sessions/tests
In directory cvs.zope.org:/tmp/cvs-serv6072/tests

Modified Files:
      Tag: Zope-2_5-branch
	testSessionDataManager.py 
Log Message:
The session tests setup conditionally removes unnecessary objects at the root of the
storage, but _delObject() can sometimes throw KeyError instead of AttributeError.  Now
the exception handlers catch either and the tests pass under these circumstances.


=== Zope/lib/python/Products/Sessions/tests/testSessionDataManager.py 1.9 => 1.9.16.1 ===
--- Zope/lib/python/Products/Sessions/tests/testSessionDataManager.py:1.9	Wed Nov 28 10:51:08 2001
+++ Zope/lib/python/Products/Sessions/tests/testSessionDataManager.py	Wed Sep 11 17:42:15 2002
@@ -73,16 +73,16 @@
         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('session_data_manager')
-    except AttributeError: pass
+    except (AttributeError, KeyError): pass
 
     try: app._delObject('index_html')
-    except AttributeError: pass
+    except (AttributeError, KeyError): pass
 
     app._setObject(idmgr_name, bidmgr)