Merge branch 'buildbot-0.8.7' of git://github.com/tomprince/buildbot …

…into buildbot-0.8.7

.gitignore

@@ -35,4 +35,3 @@ common/googlecode_upload.py
 master/docs/tutorial/_build
 _build
 .tox
-master/setuptools_trial*

master/buildbot/__init__.py

@@ -36,7 +36,8 @@
     VERSION_MATCH = re.compile(r'\d+\.\d+\.\d+(\w|-)*')
 
     try:
-        p = Popen(['git', 'describe', '--tags', '--always'], stdout=PIPE, stderr=STDOUT)
+        dir  = os.path.dirname(os.path.abspath(__file__))
+        p = Popen(['git', 'describe', '--tags', '--always'], cwd=dir, stdout=PIPE, stderr=STDOUT)
         out = p.communicate()[0]
 
         if (not p.returncode) and out:

master/buildbot/buildslave.py

@@ -616,7 +616,7 @@ def _mail_missing_message(self, subject, text):
         # first, see if we have a MailNotifier we can use. This gives us a
         # fromaddr and a relayhost.
         buildmaster = self.botmaster.master
-        for st in buildmaster.statusTargets:
+        for st in buildmaster.status:
             if isinstance(st, MailNotifier):
                 break
         else:

master/buildbot/status/client.py

@@ -67,7 +67,7 @@ def remote_isFinished(self):
 
     def remote_waitUntilFinished(self):
         d = self.b.waitUntilFinished()
-        d.addCallback(lambda res: self)
+        d.addCallback(makeRemote)
         return d
 
     def remote_getResults(self):

master/buildbot/status/web/authz.py

@@ -168,7 +168,7 @@ def login(self, request):
         def check_authenticate(res):
             if res:
                 cookie, s = self.sessions.new(user, self.auth.getUserInfo(user))
-                request.addCookie(COOKIE_KEY, cookie, s.getExpiration(),path="/")
+                request.addCookie(COOKIE_KEY, cookie, expires=s.getExpiration(),path="/")
                 request.received_cookies = {COOKIE_KEY:cookie}
                 return cookie
             else:

master/buildbot/status/web/templates/forms.html

@@ -112,6 +112,7 @@
 {% macro force_build_one_scheduler(force_url, authz, request, on_all, on_selected, builders, sch, default_props) %}
  <form method="post" name="force_build" action="{{ force_url }}" class="command_forcebuild">
 
+  <h3>{{ sch.name|e }}</h3>
   {% if on_all %}
      <p>To force a build on <strong>all Builders</strong>, fill out the following fields
           and push the 'Force Build' button</p>

master/buildbot/test/unit/test_status_web_authz_Authz.py

@@ -34,8 +34,8 @@ def getUser(self):
 
     def getPassword(self):
         return None
-    def addCookie(self, key, cookie, expiration, path):
-        self.send_cookies.append((key, cookie, expiration, path))
+    def addCookie(self, key, cookie, expires, path):
+        self.send_cookies.append((key, cookie, expires, path))
 
 class StubHttpAuthRequest(object):
     # all we need from a request is username/password

master/setup.py

@@ -23,7 +23,7 @@
 import os
 import glob
 
-from distutils.core import setup, Command
+from distutils.core import setup
 from buildbot import version
 
 from distutils.command.install_data import install_data
@@ -195,10 +195,6 @@ def make_release_tree(self, base_dir, files):
         'sqlalchemy-migrate ==0.6.1, ==0.7.0, ==0.7.1, ==0.7.2',
         'python-dateutil==1.5',
     ]
-    if '--help-commands' in sys.argv or 'trial' in sys.argv or 'test' in sys.argv:
-        setup_args['setup_requires'] = [
-            'setuptools_trial',
-        ]
     setup_args['tests_require'] = [
         'mock',
     ]

slave/setup.py

@@ -121,9 +121,6 @@ def make_release_tree(self, base_dir, files):
     setup_args['install_requires'] = [
         'twisted >= 8.0.0',
     ]
-    setup_args['setup_requires'] = [
-        'setuptools_trial',
-    ]
     setup_args['tests_require'] = [
         'mock',
     ]