Upgraded cachecontrol to latest (#378)

* Upgraded cachecontrol to latest

* Fixing some failing requests tests

Author: hiranya911

requirements.txt

@@ -4,7 +4,7 @@ pytest-cov >= 2.4.0
 pytest-localserver >= 0.4.1
 tox >= 3.6.0
 
-cachecontrol >= 0.12.4
+cachecontrol >= 0.12.6
 google-api-core[grpc] >= 1.14.0, < 2.0.0dev; platform.python_implementation != 'PyPy'
 google-api-python-client >= 1.7.8
 google-cloud-firestore >= 1.4.0; platform.python_implementation != 'PyPy'

setup.py

@@ -37,7 +37,7 @@
 long_description = ('The Firebase Admin Python SDK enables server-side (backend) Python developers '
                     'to integrate Firebase into their services and applications.')
 install_requires = [
-    'cachecontrol>=0.12.4',
+    'cachecontrol>=0.12.6',
     'google-api-core[grpc] >= 1.14.0, < 2.0.0dev; platform.python_implementation != "PyPy"',
     'google-api-python-client >= 1.7.8',
     'google-cloud-firestore>=1.4.0; platform.python_implementation != "PyPy"',

tests/test_db.py

@@ -819,7 +819,7 @@ def test_http_timeout(self):
             assert ref._client.timeout == 60
             assert ref.get() == {}
             assert len(recorder) == 1
-            assert recorder[0]._extra_kwargs['timeout'] == 60
+            assert recorder[0]._extra_kwargs['timeout'] == pytest.approx(60, 0.001)
 
     def test_app_delete(self):
         app = firebase_admin.initialize_app(

tests/test_messaging.py

@@ -1562,7 +1562,7 @@ def test_send(self):
         msg = messaging.Message(topic='foo')
         messaging.send(msg)
         assert len(self.recorder) == 1
-        assert self.recorder[0]._extra_kwargs['timeout'] == 4
+        assert self.recorder[0]._extra_kwargs['timeout'] == pytest.approx(4, 0.001)
 
     def test_topic_management_timeout(self):
         self.fcm_service._client.session.mount(
@@ -1574,7 +1574,7 @@ def test_topic_management_timeout(self):
         )
         messaging.subscribe_to_topic(['1'], 'a')
         assert len(self.recorder) == 1
-        assert self.recorder[0]._extra_kwargs['timeout'] == 4
+        assert self.recorder[0]._extra_kwargs['timeout'] == pytest.approx(4, 0.001)
 
 
 class TestSend(object):