[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/tests/ Merged from trunk:

Tue Aug 24 16:33:03 EDT 2004

Log message for revision 27254:
  Merged from trunk:
  
    r27223 | jim | 2004-08-22 22:58:36 -0400 (Sun, 22 Aug 2004) | 3 lines
  
  Fixed a stup error in the doctest generation and an even stupider
  error in the tests.
  
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tests/dochttp.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test_dochttp.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tests/dochttp.py
===================================================================

--- Zope3/branches/ZopeX3-3.0/src/zope/app/tests/dochttp.py	2004-08-24 20:30:04 UTC (rev 27253)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tests/dochttp.py	2004-08-24 20:33:03 UTC (rev 27254)
@@ -158,7 +158,6 @@
             output.extend(headers)
             output.append('')
             output.extend(self.body)
-            output.extend(self.body)
         else:
             output = []
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test_dochttp.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test_dochttp.py	2004-08-24 20:30:04 UTC (rev 27253)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test_dochttp.py	2004-08-24 20:33:03 UTC (rev 27254)
@@ -42,14 +42,6 @@
   </html>
   <BLANKLINE>
   <BLANKLINE>
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-        lang="en">
-  <BLANKLINE>
-  ...
-  <BLANKLINE>
-  </html>
-  <BLANKLINE>
-  <BLANKLINE>
 
 
   >>> print http(r"""
@@ -68,14 +60,6 @@
   </html>
   <BLANKLINE>
   <BLANKLINE>
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-        lang="en">
-  <BLANKLINE>
-  ...
-  <BLANKLINE>
-  </html>
-  <BLANKLINE>
-  <BLANKLINE>
 
 
   >>> print http(r"""
@@ -106,14 +90,6 @@
   </html>
   <BLANKLINE>
   <BLANKLINE>
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-        lang="en">
-  <BLANKLINE>
-  ...
-  <BLANKLINE>
-  </html>
-  <BLANKLINE>
-  <BLANKLINE>
 
 
   >>> print http(r"""
@@ -133,14 +109,6 @@
   </html>
   <BLANKLINE>
   <BLANKLINE>
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-        lang="en">
-  <BLANKLINE>
-  ...
-  <BLANKLINE>
-  </html>
-  <BLANKLINE>
-  <BLANKLINE>
 '''
       
 class Test(unittest.TestCase):
@@ -152,7 +120,7 @@
         dochttp(['-p', 'test', directory])
         got = sys.stdout.getvalue()
         sys.stdout = old
-        self.assert_(got, expected)
+        self.assert_(got == expected)
 
 def test_suite():
     suite = unittest.TestSuite()

