Merge lp:~exarkun/divmod.org/nevow-test-fixes into lp:divmod.org

[Jean-Paul Calderone]

Two small changes to the Nevow test suite to account for changes to Twisted which introduced test failures in Nevow's test suite.

[Glyph Lefkowitz (glyph)]

1. Does nevow have continuous integration someplace? I'd love to see a green buildbot.

2. "# ugly :(" isn't really documentation. It'd be nice for there to be a function in the test module that actually does the private-attribute mangling so we could change the implementation later and so you could hang a docstring.

3. Does this change the required Twisted version? If so please document.

Other than #3, don't let this stop you from landing.

review: Approve (awesome)

[lp:~exarkun/divmod.org/nevow-test-fixes]

2701. By Jean-Paul Calderone on 2013-01-01

Less ugly

[Jean-Paul Calderone (exarkun)]

> 1. Does nevow have continuous integration someplace? I'd love to see a green buildbot.

It doesn't. :/ The tests pass on my Ubuntu 12.04 laptop. :/ Do we have any options for continuous integration?

> 2. "# ugly :(" isn't really documentation.

Agreed...

> 3. Does this change the required Twisted version? If so please document.

It swaps a failing test on Twisted >= 11.0 for a failing test on Twisted < 11.0. Apart from the fact that tests passing is how you know whether things work (or work together), I don't think it changes which versions of Twisted Nevow supports.

=== 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	2013-01-01 21:46:22 +0000
@@ -170,14 +170,20 @@
         assert proto.transport.disconnecting
         return proto
 
+
+    def setSiteTime(self, when):
+        """
+        Forcibly override the current time as known by C{self.site}.
+
+        This relies on knowledge of private details of
+        L{twisted.web.server.Site}.  It would be nice if there were an API on
+        that class for doing this more properly, to facilitate testing.
+        """
+        self.site._logDateTime = when
+
+
     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.setSiteTime('faketime')
         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	2013-01-01 21:46:22 +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)