Merge branch 'master' into nine

master/buildbot/buildslave/__init__.py

@@ -476,7 +476,7 @@ def _accept_slave(res):
             if self.slave_system == "nt":
                 self.path_module = namedModule("ntpath")
             else:
-                # most eveything accepts / as separator, so posix should be a
+                # most everything accepts / as separator, so posix should be a
                 # reasonable fallback
                 self.path_module = namedModule("posixpath")
             log.msg("bot attached")

master/buildbot/status/web/authz.py

@@ -91,7 +91,7 @@ def getUsername(self, request):
         return request.args.get("username", ["<unknown>"])[0]
 
     def getUsernameHTML(self, request):
-        """Get the user formatated in html (with possible link to email)"""
+        """Get the user formatted in html (with possible link to email)"""
         if self.useHttpHeader:
             return request.getUser()
         s = self.session(request)

master/buildbot/status/web/hooks/gitlab.py

@@ -15,12 +15,7 @@
 
 from twisted.python import log
 from buildbot.status.web.hooks.github import process_change
-
-try:
-    import json
-    assert json
-except ImportError:
-    import simplejson as json
+from buildbot.util import json
 
 
 def getChanges(request, options=None):
@@ -31,7 +26,10 @@ def getChanges(request, options=None):
         request
             the http request object
     """
-    payload = json.load(request.content)
+    try:
+        payload = json.load(request.content)
+    except Exception, e:
+        raise ValueError("Error loading JSON: " + str(e))
     user = payload['user_name']
     repo = payload['repository']['name']
     repo_url = payload['repository']['url']

master/buildbot/test/unit/test_changes_mail_CVSMaildirSource.py

@@ -128,7 +128,7 @@ def test_CVSMaildirSource_create_change_from_cvs1_12_with_no_path(self):
             self.fail('Expect ValueError.')
 
     def test_CVSMaildirSource_create_change_with_bad_cvsmode(self):
-        # Branch is indicated afer 'Tag:' in modified file list
+        # Branch is indicated after 'Tag:' in modified file list
         msg = cvs1_11_msg.replace('Cvsmode: 1.11', 'Cvsmode: 9.99')
         m = message_from_string(msg)
         src = CVSMaildirSource('/dev/null')
@@ -140,7 +140,7 @@ def test_CVSMaildirSource_create_change_with_bad_cvsmode(self):
             self.fail('Expected ValueError')
 
     def test_CVSMaildirSource_create_change_with_branch(self):
-        # Branch is indicated afer 'Tag:' in modified file list
+        # Branch is indicated after 'Tag:' in modified file list
         msg = cvs1_11_msg.replace('        GNUmakefile',
                                   '      Tag: Test_Branch\n      GNUmakefile')
         m = message_from_string(msg)

master/buildbot/test/unit/test_status_web_change_hooks_gitlab.py → master/buildbot/test/unit/test_status_web_hooks_gitlab.py

@@ -14,7 +14,7 @@
 # Copyright Buildbot Team Members
 
 import calendar
-
+import mock
 import buildbot.status.web.change_hook as change_hook
 from buildbot.test.fake.web import FakeRequest
 
@@ -112,10 +112,9 @@ def testGitWithNoJson(self):
         d = self.request.test_render(self.changeHook)
 
         def check_changes(r):
-            expected = "No JSON object could be decoded"
             self.assertEquals(len(self.request.addedChanges), 0)
-            self.assertEqual(self.request.written, expected)
-            self.request.setResponseCode.assert_called_with(400, expected)
+            self.assertIn("Error loading JSON:", self.request.written)
+            self.request.setResponseCode.assert_called_with(400, mock.ANY)
 
         d.addCallback(check_changes)
         return d

master/docs/conf.py

@@ -58,7 +58,7 @@
 # The full version, including alpha/beta/rc tags.
 release = version
 
-# add a loud note for anyone loking at the latest docs
+# add a loud note for anyone looking at the latest docs
 if release == 'latest':
     rst_prolog = textwrap.dedent("""\
     .. caution:: This page documents the latest, unreleased version of

master/docs/developer/tests.rst

@@ -28,7 +28,7 @@ Tests are divided into a few suites:
   and execute a lot of code.  As such, use of integration tests is limited to a
   few, broad tests to act as a failsafe for the unit and interface tests.
 
-* Regression tests (``buildbot.test.regrssions``) - these test to prevent
+* Regression tests (``buildbot.test.regressions``) - these test to prevent
   re-occurrence of historical bugs.  In most cases, a regression is better
   tested by a test in the other suites, or unlike to recur, so this suite tends
   to be small.

master/docs/tutorial/firstrun.rst

@@ -178,4 +178,4 @@ touching the configuration.
 
 You've got a taste now, but you're probably curious for more.  Let's step it
 up a little in the second tutorial by changing the configuration and doing
-an actual build. Continue on to :ref:`quick-tour-label`
+an actual build. Continue on to :ref:`quick-tour-label`.

slave/buildslave/bot.py

@@ -413,7 +413,7 @@ def doKeepalive():
             # was already dropped, so just log and ignore.
             log.msg("sending app-level keepalive")
             d = self.perspective.callRemote("keepalive")
-            d.addErrback(log.err, "eror sending keepalive")
+            d.addErrback(log.err, "error sending keepalive")
         self.keepaliveTimer = self._reactor.callLater(self.keepaliveInterval,
                                                       doKeepalive)
 

slave/buildslave/runprocess.py

@@ -593,7 +593,7 @@ def _chunkForSend(self, data):
     def _collapseMsg(self, msg):
         """
         Take msg, which is a dictionary of lists of output chunks, and
-        concatentate all the chunks into a single string
+        concatenate all the chunks into a single string
         """
         retval = {}
         for log in msg: