Merge branch 'buildbot-0.8.0'

* buildbot-0.8.0:
  try (unsuccesfully) to exclude broken_test from epydoc
  fix typo

buildbot/changes/hgbuildbot.py

@@ -62,8 +62,8 @@ def hook(ui, repo, hooktype, node=None, source=None, **kwargs):
         branchtype = ui.config('hgbuildbot', 'branchtype')
         branch = ui.config('hgbuildbot', 'branch')
         fork = ui.configbool('hgbuildbot', 'fork', False)
-        stripcount = int(ui.config('notify','strip') or # notify also has this setting
-                    ui.config('hgbuildbot','strip',3)))
+        # notify also has this setting
+        stripcount = int(ui.config('notify','strip') or ui.config('hgbuildbot','strip',3))
         category = ui.config('hgbuildbot', 'category', None)
         project = ui.config('hgbuildbot', 'project', '')
     else:

docs/epyrun

@@ -100,7 +100,9 @@ modnames = []
 def addMod(arg, path, files):
     for fn in files:
         file = os.path.join(path, fn).replace('%s__init__'%os.sep, '')
-        if file[-3:] == '.py' and not file.count('%stest%s' % (os.sep,os.sep)):
+        if file.count('%stest%s' % (os.sep,os.sep)): continue
+        if file.count('%sbroken_test%s' % (os.sep,os.sep)): continue
+        if file[-3:] == '.py':
             modName = file[:-3].replace(os.sep,'.')
             try:
                 #print 'pre-loading', modName
@@ -173,6 +175,8 @@ def main():
 
     if 'buildbot.test' in modnames:
         modnames.remove('buildbot.test')
+    if 'buildbot.broken_test' in modnames:
+        modnames.remove('buildbot.broken_test')
     ##if 'twisted' in modnames:
     ##    modnames.remove('twisted')