[Checkins] SVN: zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/ Began doctest2.txt to make sure cookie info is not saved across a suite.

[matt@zope.com]

Log message for revision 91945:
  Began doctest2.txt to make sure cookie info is not saved across a suite.
  

Changed:
  U   zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/doctest.txt
  U   zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/functional.py
  U   zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/tests.py

-=-
Modified: zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/doctest.txt
===================================================================
--- zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/doctest.txt	2008-10-09 21:00:37 UTC (rev 91944)
+++ zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/doctest.txt	2008-10-09 21:57:50 UTC (rev 91945)
@@ -143,4 +143,3 @@
 
   >>> list(root.keys())
   [u'f1']
-

Modified: zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/functional.py
===================================================================
--- zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/functional.py	2008-10-09 21:00:37 UTC (rev 91944)
+++ zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/functional.py	2008-10-09 21:57:50 UTC (rev 91945)
@@ -780,14 +780,14 @@
 
 def _prepare_doctest_keywords(kw):
     globs = kw.setdefault('globs', {})
-    globs['http'] = HTTPCaller()
+    # globs['http'] = HTTPCaller()
     globs['getRootFolder'] = getRootFolder
     globs['sync'] = sync
 
     kwsetUp = kw.get('setUp')
     def setUp(test):
+	test.globs['http'] = HTTPCaller()
         FunctionalTestSetup().setUp()
-
         if kwsetUp is not None:
             kwsetUp(test)
     kw['setUp'] = setUp

Modified: zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/tests.py
===================================================================
--- zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/tests.py	2008-10-09 21:00:37 UTC (rev 91944)
+++ zope.app.testing/branches/matt-fix-cookie-leak/src/zope/app/testing/tests.py	2008-10-09 21:57:50 UTC (rev 91945)
@@ -612,7 +612,7 @@
     RetryProblemFunctional.layer = AppTestingLayer
     RetryProblemBrowser.layer = AppTestingLayer
 
-    doc_test = FunctionalDocFileSuite('doctest.txt', checker=checker)
+    doc_test = FunctionalDocFileSuite('doctest.txt', 'doctest2.txt', checker=checker)
     doc_test.layer = AppTestingLayer
 
     return unittest.TestSuite((