Merge pull request googleapis#125 from alanbriolat/httpmock-bytes

Force HttpMock to read content from file as bytes.

Author: nathanielmanistaatgoogle

Diff for: googleapiclient/http.py

@@ -1463,7 +1463,7 @@ def __init__(self, filename=None, headers=None):
     if headers is None:
       headers = {'status': '200'}
     if filename:
-      f = open(filename, 'r')
+      f = open(filename, 'rb')
       self.data = f.read()
       f.close()
     else:

Diff for: tests/data/bad_request.json

@@ -0,0 +1,13 @@
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "usageLimits",
+    "reason": "keyInvalid",
+    "message": "Bad Request"
+   }
+  ],
+  "code": 400,
+  "message": "Bad Request"
+ }
+}

Diff for: tests/test_http.py

@@ -1010,6 +1010,17 @@ def test_default_response_headers(self):
     resp, content = http.request("http://example.com")
     self.assertEqual(resp.status, 200)
 
+  def test_error_response(self):
+    http = HttpMock(datafile('bad_request.json'), {'status': '400'})
+    model = JsonModel()
+    request = HttpRequest(
+        http,
+        model.response,
+        'https://www.googleapis.com/someapi/v1/collection/?foo=bar',
+        method='GET',
+        headers={})
+    self.assertRaises(HttpError, request.execute)
+
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.ERROR)