divmod-dev team mailing list archive

[Jean-Paul Calderone <exarkun@xxxxxxxxxxxxxxxxx>]

Jean-Paul Calderone has proposed merging lp:~exarkun/divmod.org/nevow-test-fixes into lp:divmod.org.

Requested reviews:
  Divmod-dev (divmod-dev)

For more details, see:
https://code.launchpad.net/~exarkun/divmod.org/nevow-test-fixes/+merge/141498

Two small changes to the Nevow test suite to account for changes to Twisted which introduced test failures in Nevow's test suite.
-- 
https://code.launchpad.net/~exarkun/divmod.org/nevow-test-fixes/+merge/141498
Your team Divmod-dev is requested to review the proposed merge of lp:~exarkun/divmod.org/nevow-test-fixes into lp:divmod.org.

=== modified file 'Nevow/nevow/test/test_appserver.py'
--- Nevow/nevow/test/test_appserver.py	2007-12-20 15:51:48 +0000
+++ Nevow/nevow/test/test_appserver.py	2012-12-31 00:31:23 +0000
@@ -171,13 +171,7 @@
         return proto
 
     def test_oldStyle(self):
-        # need to try the new location first to make _logDateTime
-        # faking work
-        try:
-            from twisted.web import http
-        except ImportError:
-            from twisted.protocols import http
-        http._logDateTime = 'faketime' # ugly :(
+        self.site._logDateTime = 'faketime' # ugly :(
         proto = self.renderResource('/foo')
         logLines = proto.site.logFile.getvalue().splitlines()
         self.assertEquals(len(logLines), 1)

=== modified file 'Nevow/nevow/test/test_errorhandler.py'
--- Nevow/nevow/test/test_errorhandler.py	2006-04-14 17:23:46 +0000
+++ Nevow/nevow/test/test_errorhandler.py	2012-12-31 00:31:23 +0000
@@ -79,7 +79,7 @@
         def later((code, html)):
             self.assertEquals(rend.FourOhFour.notFound, html)
             self.assertEquals(code, 404)
-            fe = log.flushErrors(BrokenException)
+            fe = self.flushLoggedErrors(BrokenException)
             self.assertEquals(len(fe), 1)
         return renderResource('/foo', notFoundHandler=BadNotFoundHandler()).addCallback(later)