#3 Validate get gpg key

Signed-off-by: Uilian Ries <uilianries@gmail.com>

Author: uilianries

bintray/requester.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import requests
+import json
 
 from requests.auth import HTTPBasicAuth
 
@@ -31,7 +32,10 @@ def _add_status_code(self, response):
         :param response: Requests response
         :return: Response JSON
         """
-        json_data = response.json()
+        try:
+            json_data = response.json()
+        except json.decoder.JSONDecodeError:
+            json_data = {'message': response.content.decode()}
         if isinstance(json_data, list):
             json_data.append({"statusCode": response.status_code, "error": not response.ok})
         else:

tests/test_content_signing.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from bintray.bintray import Bintray
+
+
+def test_get_org_gpg_public_key():
+    bintray = Bintray()
+    response = bintray.get_org_gpg_public_key("jfrog")
+    assert response.get("error") == False
+    assert response.get("statusCode") == 200
+    assert "BEGIN PGP PUBLIC KEY BLOCK" in response.get("message")
+
+
+def test_get_user_gpg_public_key():
+    bintray = Bintray()
+    response = bintray.get_user_gpg_public_key("bintray")
+    assert response.get("error") == False
+    assert response.get("statusCode") == 200
+    assert "BEGIN PGP PUBLIC KEY BLOCK" in response.get("message")
+