fix gitlab tests to not rely on json error messages

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_status_web_change_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