From fe4efb855a6381e313791998cae01a8ffe5797ba Mon Sep 17 00:00:00 2001
From: Marcus Lindblom <macke@yar.nu>
Date: Sun, 27 Dec 2009 21:37:53 +0100
Subject: [PATCH] Fix some failing web tests

---
 buildbot/status/web/build.py |  6 ++++++
 buildbot/test/test_web.py    | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/buildbot/status/web/build.py b/buildbot/status/web/build.py
index f2f942e3444..f997a114e44 100644
--- a/buildbot/status/web/build.py
+++ b/buildbot/status/web/build.py
@@ -1,5 +1,6 @@
 
 from twisted.web import html
+from twisted.web.error import NoResource
 from twisted.web.util import Redirect, DeferredResource
 from twisted.internet import defer, reactor
 
@@ -12,6 +13,8 @@
 from buildbot.status.web.step import StepsResource
 from buildbot import util
 
+
+
 # /builders/$builder/builds/$buildnum
 class StatusResourceBuild(HtmlResource):
     addSlash = True
@@ -208,6 +211,9 @@ def __init__(self, builder_status, builder_control):
         self.builder_status = builder_status
         self.builder_control = builder_control
 
+    def content(self, req, cxt):
+        return "subpages shows data for each build"
+
     def getChild(self, path, req):
         try:
             num = int(path)
diff --git a/buildbot/test/test_web.py b/buildbot/test/test_web.py
index fc9b8eb4d76..ee90ebe34cb 100644
--- a/buildbot/test/test_web.py
+++ b/buildbot/test/test_web.py
@@ -283,14 +283,27 @@ def test_urls(self):
         s = setupBuildStepStatus("test_web.test_urls")
         s.addURL("coverage", "http://coverage.example.org/target")
         s.addURL("icon", "http://coverage.example.org/icon.png")
+
+
+        class FakeService:
+            import jinja2
+            templates = jinja2.Environment(loader=jinja2.PackageLoader('buildbot.status.web', 'templates'),
+                                       extensions=['jinja2.ext.i18n'],
+                                       trim_blocks=True)
+        
+        class FakeSite:
+            buildbot_service = FakeService()        
+        
         class FakeRequest:
+            site = FakeSite()
             prepath = []
             postpath = []
             def childLink(self, name):
                 return name
+
         req = FakeRequest()
         box = waterfall.IBox(s).getBox(req)
-        text = "\n".join(box.td()['text'])
+        text = box.td()['text']
         e1 = '[<a href="http://coverage.example.org/target" class="BuildStep external">coverage</a>]'
         self.failUnlessSubstring(e1, text)
         e2 = '[<a href="http://coverage.example.org/icon.png" class="BuildStep external">icon</a>]'