Skip to content

Commit

Permalink
Merge branch 'master' into buildbot-0.8.0
Browse files Browse the repository at this point in the history
* master:
  don't capitalize build property names
  do not use twisted.python.monkey, which is not in tw-2.5.0
  Directory listings require Twisted >= 9.0.0 (fixes buildbot#812)
  add news about mercurial revision ids
  remove spurious file
  • Loading branch information
Dustin J. Mitchell committed May 1, 2010
2 parents c512b5b + dabfc8c commit 46194be
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
6 changes: 3 additions & 3 deletions buildbot/status/web/base.py
Expand Up @@ -252,8 +252,8 @@ def content(self, request, cxt):
template = request.site.buildbot_service.templates.get_template("empty.html")
return template.render(**cxt)

# DirectoryLister isn't available in Twisted-2.5.0, so we just skip
# this particular feature.
# DirectoryLister isn't available in Twisted-2.5.0, and isn't compatible with what
# we need until 9.0.0, so we just skip this particular feature.
have_DirectoryLister = False
if hasattr(static, 'DirectoryLister'):
have_DirectoryLister = True
Expand Down Expand Up @@ -296,7 +296,7 @@ def directoryListing(self):
self.defaultType)
else:
return static.Data("""
Directory Listings require Twisted-8.0.0 or later
Directory Listings require Twisted-9.0.0 or later
""", "text/plain")


Expand Down
2 changes: 1 addition & 1 deletion buildbot/status/web/templates/build.html
Expand Up @@ -136,7 +136,7 @@ <h2>Build Properties:</h2>

{% for p in properties %}
<tr class="{{ loop.cycle('alt', '') }}">
<td class="left">{{ p.name|e|capitalize }}</td>
<td class="left">{{ p.name|e }}</td>
{% if p.short_value %}
<td>{{ p.short_value|e }} .. [property value too long]</td>
{% else %}
Expand Down
1 change: 0 additions & 1 deletion buildbot/test/unit/test_util_loop.py
Expand Up @@ -39,7 +39,6 @@
from twisted.internet import reactor, defer, task
from twisted.application import service
from twisted.python import log
from twisted.python import monkey

from buildbot.test.fake.state import State

Expand Down
9 changes: 9 additions & 0 deletions buildbot/util/monkeypatches.py
@@ -1,3 +1,5 @@
from twisted.trial import unittest

def add_debugging_monkeypatches():
"""
DO NOT CALL THIS DIRECTLY
Expand All @@ -16,3 +18,10 @@ def stopService(self):
return old_stopService(self)
Service.startService = startService
Service.stopService = stopService

# make unittest.TestCase have a patch method, even if it just skips
# the test.
def nopatch(self, *args):
raise unittest.SkipTest('unittest.patch is not available')
if not hasattr(unittest.TestCase, 'patch'):
unittest.TestCase.patch = nopatch

0 comments on commit 46194be

Please sign in to comment.