Merge branch 'develop'

* develop:
  Ignore pytest cache directory
  Add error handling for invalid responses

.gitignore

@@ -20,6 +20,7 @@ ChangeLog
 
 # pytest files
 /.cache
+/.pytest_cache
 
 # Build and artifact dirs
 /build

festung/dbapi.py

@@ -221,9 +221,16 @@ def _request(self, *args, **kwargs):
             return self.connection._request(*args, **kwargs)
         except requests.HTTPError as e:
             self._raise_for_error(e.response)
+        except requests.RequestException as e:
+            raise InternalError(e)
 
     def _raise_for_error(self, response):
-        error = response.json()['error']
+        try:
+            error = response.json()['error']
+        except ValueError as e:
+            raise InternalError("Invalid JSON: {}".format(e))
+        except KeyError as e:
+            raise InternalError("Missing error in response.")
         type_ = error['type']
         description = error['description']
         exception_class = error_to_exception[type_]

tests/test_dbapi.py

@@ -241,6 +241,17 @@ def run_query(self, cursor, exc_type):
         return excinfo.value
 
 
+class TestInvalidDataResponse(object):
+    @pytest.mark.parametrize('data,status,exc_class', [
+        ('{', httplib.INTERNAL_SERVER_ERROR, exceptions.InternalError),
+        ('{}', httplib.INTERNAL_SERVER_ERROR, exceptions.InternalError),
+    ])
+    def test_execute(self, festung, cursor, data, status, exc_class):
+        festung.add_response(data, status)
+        with pytest.raises(exc_class):
+            cursor.execute('SELECT 1;')
+
+
 class TestCustomMethods(object):
     def test_drop(self, festung, cursor, database, password):
         festung.add_empty_response()