From 2e0bec293ce8b828823cb2a655cd8f55895ea31a Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Fri, 23 Sep 2016 14:42:47 -0700
Subject: [PATCH] Improve error handling for ansible-core-ci. (#17734)

---
 test/utils/shippable/ansible-core-ci | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/utils/shippable/ansible-core-ci b/test/utils/shippable/ansible-core-ci
index c0c25aaf22..44fd1df105 100755
--- a/test/utils/shippable/ansible-core-ci
+++ b/test/utils/shippable/ansible-core-ci
@@ -359,7 +359,10 @@ class HttpResponse:
         self.response = response
 
     def json(self):
-        return json.loads(self.response)
+        try:
+            return json.loads(self.response)
+        except ValueError:
+            raise ValueError('Cannot parse response as JSON:\n%s' % self.response)
 
 
 requests = HttpRequest()