Merging with master (resolved conflicts in test_db.py)

tests/test_db.py

@@ -18,12 +18,32 @@
 import sys
 
 import pytest
+from requests import exceptions
+from requests import Response
 
 import firebase_admin
 from firebase_admin import db
 from tests import testutils
 
 
+class MockAdapter(testutils.MockAdapter):
+ _ETAG = '0'
+
+ def __init__(self, data, status, recorder):
+ testutils.MockAdapter.__init__(self, data, status, recorder)
+
+ def send(self, request, **kwargs):
+ if_match = request.headers.get('if-match')
+ if if_match and if_match != MockAdapter._ETAG:
+ response = Response()
+ response._content = request.body
+ response.headers = {'ETag': MockAdapter._ETAG}
+ raise exceptions.RequestException(response=response)
+ resp = super(MockAdapter, self).send(request, **kwargs)
+ resp.headers = {'ETag': MockAdapter._ETAG}
+ return resp
+
+
 class _Object(object):
  pass
 
@@ -107,7 +127,7 @@ def teardown_class(cls):
 
  def instrument(self, ref, payload, status=200):
  recorder = []
- adapter = testutils.MockAdapter(payload, status, recorder)
+ adapter = MockAdapter(payload, status, recorder)
  ref._client._session.mount(self.test_url, adapter)
  return recorder
 
@@ -349,7 +369,7 @@ def teardown_class(cls):
 
  def instrument(self, ref, payload, status=200):
  recorder = []
- adapter = testutils.MockAdapter(payload, status, recorder)
+ adapter = MockAdapter(payload, status, recorder)
  ref._client._session.mount(self.test_url, adapter)
  return recorder