[CMF-checkins] CVS: Products/CMFCalendar/tests - test_Calendar.py:1.12.2.4

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFCalendar/tests
In directory cvs.zope.org:/tmp/cvs-serv28754/CMFCalendar/tests

Modified Files:
      Tag: CMF-1_5-branch
	test_Calendar.py 
Log Message:
depending on the test environment, temp_folder might exist already


=== Products/CMFCalendar/tests/test_Calendar.py 1.12.2.3 => 1.12.2.4 ===
--- Products/CMFCalendar/tests/test_Calendar.py:1.12.2.3	Sun Apr  3 16:15:16 2005
+++ Products/CMFCalendar/tests/test_Calendar.py	Sun Apr  3 17:59:50 2005
@@ -99,9 +99,12 @@
         self.Site.setupCurrentSkin(app.REQUEST)
 
         # sessioning setup
-        app._setObject( 'temp_folder', MountedTemporaryFolder('temp_folder') )
-        app.temp_folder._setObject( 'session_data',
-                                    TransientObjectContainer('session_data') )
+        if getattr(app, 'temp_folder', None) is None:
+            temp_folder = MountedTemporaryFolder('temp_folder')
+            app._setObject('temp_folder', temp_folder)
+        if getattr(app.temp_folder, 'session_data', None) is None:
+            session_data = TransientObjectContainer('session_data')
+            app.temp_folder._setObject('session_data', session_data)
         app.REQUEST.set_lazy( 'SESSION',
                               app.session_data_manager.getSessionData )