Merge #7833: tests: Check Content-Type header returned from RPC server

5078ca4 tests: Check Content-Type header returned from RPC server (Wladimir J. van der Laan)
bitcoin · Apr 18, 2016 · b1bf511 · b1bf511
2 parents ec870e1 + 5078ca4
commit b1bf511
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
@@ -154,6 +154,11 @@ def _get_response(self):
             raise JSONRPCException({
                 'code': -342, 'message': 'missing HTTP response from server'})
 
+        content_type = http_response.getheader('Content-Type')
+        if content_type != 'application/json':
+            raise JSONRPCException({
+                'code': -342, 'message': 'non-JSON HTTP response with \'%i %s\' from server' % (http_response.status, http_response.reason)})
+
         responsedata = http_response.read().decode('utf8')
         response = json.loads(responsedata, parse_float=decimal.Decimal)
         if "error" in response and response["error"] is None: