Turn requests.X mocks into requests.Session.X

Author: dkirov-dd

amazon_msk/tests/conftest.py

@@ -32,7 +32,7 @@ def mock_requests_get(url, *args, **kwargs):
 
 @pytest.fixture
 def mock_data():
-    with mock.patch('requests.get', side_effect=mock_requests_get, autospec=True):
+    with mock.patch('requests.Session.get', side_effect=mock_requests_get, autospec=True):
         yield
 
 

arangodb/tests/test_arangodb.py

@@ -56,7 +56,7 @@ def mock_requests_get(url, *args, **kwargs):
         fixture = url.rsplit('/', 1)[-1]
         return MockResponse(file_path=os.path.join(os.path.dirname(__file__), 'fixtures', tag_condition, fixture))
 
-    with mock.patch('requests.get', side_effect=mock_requests_get, autospec=True):
+    with mock.patch('requests.Session.get', side_effect=mock_requests_get, autospec=True):
         dd_run_check(check)
 
     aggregator.assert_service_check(

cert_manager/tests/test_cert_manager.py

@@ -15,7 +15,7 @@
 @pytest.fixture()
 def error_metrics():
     with mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(status_code=502, headers={'Content-Type': "text/plain"}),
     ):
         yield
@@ -34,7 +34,7 @@ def test_check(aggregator, dd_run_check):
     def mock_requests_get(url, *args, **kwargs):
         return MockResponse(file_path=os.path.join(os.path.dirname(__file__), 'fixtures', 'cert_manager.txt'))
 
-    with mock.patch('requests.get', side_effect=mock_requests_get, autospec=True):
+    with mock.patch('requests.Session.get', side_effect=mock_requests_get, autospec=True):
         dd_run_check(check)
 
     expected_metrics = dict(CERT_METRICS)

citrix_hypervisor/tests/conftest.py

@@ -50,5 +50,5 @@ def mock_requests_get(url, *args, **kwargs):
 
 @pytest.fixture
 def mock_responses():
-    with mock.patch('requests.get', side_effect=mock_requests_get):
+    with mock.patch('requests.Session.get', side_effect=mock_requests_get):
         yield

datadog_checks_base/tests/base/utils/http/test_authtoken.py

@@ -612,7 +612,7 @@ def auth(*args, **kwargs):
             return MockResponse(status_code=404)
 
         http = RequestsWrapper(instance, init_config)
-        with mock.patch('requests.post', side_effect=login), mock.patch('requests.Session.get', side_effect=auth):
+        with mock.patch('requests.Session.post', side_effect=login), mock.patch('requests.Session.get', side_effect=auth):
             http.get('https://leader.mesos/service/some-service')
 
 

envoy/tests/legacy/test_unit.py

@@ -189,7 +189,7 @@ def test_metadata_with_exception(
     check.check_id = 'test:123'
     check.log = mock.MagicMock()
 
-    with mock.patch('requests.get', side_effect=exception):
+    with mock.patch('requests.Session.get', side_effect=exception):
         check._collect_metadata()
         datadog_agent.assert_metadata_count(0)
         check.log.warning.assert_called_with(*log_call_parameters)

haproxy/tests/conftest.py

@@ -210,7 +210,7 @@ def haproxy_mock():
     filepath = os.path.join(HERE, 'fixtures', 'mock_data')
     with open(filepath, 'rb') as f:
         data = f.read()
-    p = mock.patch('requests.get', return_value=mock.Mock(content=data))
+    p = mock.patch('requests.Session.get', return_value=mock.Mock(content=data))
     yield p.start()
     p.stop()
 
@@ -228,7 +228,7 @@ def haproxy_mock_evil():
     filepath = os.path.join(HERE, 'fixtures', 'mock_data_evil')
     with open(filepath, 'rb') as f:
         data = f.read()
-    p = mock.patch('requests.get', return_value=mock.Mock(content=data))
+    p = mock.patch('requests.Session.get', return_value=mock.Mock(content=data))
     yield p.start()
     p.stop()
 
@@ -238,7 +238,7 @@ def haproxy_mock_enterprise_version_info():
     filepath = os.path.join(HERE, 'fixtures', 'enterprise_version_info.html')
     with open(filepath, 'rb') as f:
         data = f.read()
-    with mock.patch('requests.get', return_value=mock.Mock(content=data)) as p:
+    with mock.patch('requests.Session.get', return_value=mock.Mock(content=data)) as p:
         yield p
 
 

haproxy/tests/legacy/test_unit.py

@@ -433,7 +433,7 @@ def test_version_failure(aggregator, check, datadog_agent):
     filepath = os.path.join(os.path.dirname(common.HERE), 'fixtures', 'mock_data')
     with open(filepath, 'rb') as f:
         data = f.read()
-    with mock.patch('requests.get') as m:
+    with mock.patch('requests.Session.get') as m:
         m.side_effect = [RuntimeError("Ooops"), mock.Mock(content=data)]
         haproxy_check.check(config)
 

kube_controller_manager/tests/test_kube_controller_manager.py

@@ -37,7 +37,7 @@ def mock_metrics():
     with open(f_name, 'r') as f:
         text_data = f.read()
     with mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
         ),
@@ -146,13 +146,13 @@ def test_service_check_ok(monkeypatch):
     ]
 
     # successful health check
-    with mock.patch("requests.get", return_value=mock.MagicMock(status_code=200)):
+    with mock.patch('requests.Session.get', return_value=mock.MagicMock(status_code=200)):
         check._perform_service_check(instance)
 
     # failed health check
     raise_error = mock.Mock()
     raise_error.side_effect = requests.HTTPError('health check failed')
-    with mock.patch("requests.get", return_value=mock.MagicMock(raise_for_status=raise_error)):
+    with mock.patch('requests.Session.get', return_value=mock.MagicMock(raise_for_status=raise_error)):
         check._perform_service_check(instance)
 
     check.service_check.assert_has_calls(calls)

kube_controller_manager/tests/test_sli_metrics.py

@@ -22,7 +22,7 @@ def mock_metrics():
     with open(f_name, 'r') as f:
         text_data = f.read()
     with mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
         ),
@@ -205,23 +205,23 @@ def mock_request():
 
 
 def test_detect_sli_endpoint(mock_metrics, instance):
-    with mock.patch('requests.get') as mock_request:
+    with mock.patch('requests.Session.get') as mock_request:
         mock_request.return_value.status_code = 200
         c = KubeControllerManagerCheck(CHECK_NAME, {}, [instance])
         c.check(instance)
         assert instance["slis_available"] is True
 
 
 def test_detect_sli_endpoint_404(mock_metrics, instance):
-    with mock.patch('requests.get') as mock_request:
+    with mock.patch('requests.Session.get') as mock_request:
         mock_request.return_value.status_code = 404
         c = KubeControllerManagerCheck(CHECK_NAME, {}, [instance])
         c.check(instance)
         assert instance["slis_available"] is False
 
 
 def test_detect_sli_endpoint_403(mock_metrics, mock_request, instance):
-    with mock.patch('requests.get') as mock_request:
+    with mock.patch('requests.Session.get') as mock_request:
         mock_request.return_value.status_code = 403
         c = KubeControllerManagerCheck(CHECK_NAME, {}, [instance])
         c.check(instance)

kube_dns/tests/test_kube_dns.py

@@ -24,7 +24,7 @@ def mock_get():
     with open(f_name, 'r') as f:
         text_data = f.read()
     with mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
         ),
@@ -96,13 +96,13 @@ def test_service_check_ok(self, monkeypatch):
         ]
 
         # successful health check
-        with mock.patch("requests.get", return_value=mock.MagicMock(status_code=200)):
+        with mock.patch('requests.Session.get', return_value=mock.MagicMock(status_code=200)):
             check._perform_service_check(instance)
 
         # failed health check
         raise_error = mock.Mock()
         raise_error.side_effect = requests.HTTPError('health check failed')
-        with mock.patch("requests.get", return_value=mock.MagicMock(raise_for_status=raise_error)):
+        with mock.patch('requests.Session.get', return_value=mock.MagicMock(raise_for_status=raise_error)):
             check._perform_service_check(instance)
 
         check.service_check.assert_has_calls(calls)

kube_metrics_server/tests/test_kube_metrics_server.py

@@ -28,7 +28,7 @@ def mock_metrics():
     with open(f_name, 'r') as f:
         text_data = f.read()
     with mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
         ),
@@ -76,13 +76,13 @@ def test_service_check_ok(monkeypatch):
     ]
 
     # successful health check
-    with mock.patch("requests.get", return_value=mock.MagicMock(status_code=200)):
+    with mock.patch('requests.Session.get', return_value=mock.MagicMock(status_code=200)):
         check._perform_service_check(instance)
 
     # failed health check
     raise_error = mock.Mock()
     raise_error.side_effect = requests.HTTPError('health check failed')
-    with mock.patch("requests.get", return_value=mock.MagicMock(raise_for_status=raise_error)):
+    with mock.patch('requests.Session.get', return_value=mock.MagicMock(raise_for_status=raise_error)):
         check._perform_service_check(instance)
 
     check.service_check.assert_has_calls(calls)

kube_proxy/tests/test_kube_proxy.py

@@ -25,7 +25,7 @@ def mock_iptables():
     with open(f_name, 'r') as f:
         text_data = f.read()
     mock_iptables = mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
         ),
@@ -40,7 +40,7 @@ def mock_userspace():
     with open(f_name, 'r') as f:
         text_data = f.read()
     mock_userspace = mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
         ),
@@ -119,13 +119,13 @@ def test_service_check_ok(monkeypatch):
     ]
 
     # successful health check
-    with mock.patch("requests.get", return_value=mock.MagicMock(status_code=200)):
+    with mock.patch('requests.Session.get', return_value=mock.MagicMock(status_code=200)):
         check._perform_service_check(instance)
 
     # failed health check
     raise_error = mock.Mock()
     raise_error.side_effect = requests.HTTPError('health check failed')
-    with mock.patch("requests.get", return_value=mock.MagicMock(raise_for_status=raise_error)):
+    with mock.patch('requests.Session.get', return_value=mock.MagicMock(raise_for_status=raise_error)):
         check._perform_service_check(instance)
 
     check.service_check.assert_has_calls(calls)

kube_scheduler/tests/test_kube_scheduler_1_14.py

@@ -25,7 +25,7 @@ def mock_metrics():
     with open(f_name, 'r') as f:
         text_data = f.read()
     with mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
         ),
@@ -118,13 +118,13 @@ def test_service_check_ok(monkeypatch):
     ]
 
     # successful health check
-    with mock.patch("requests.get", return_value=mock.MagicMock(status_code=200)):
+    with mock.patch('requests.Session.get', return_value=mock.MagicMock(status_code=200)):
         check._perform_service_check(instance)
 
     # failed health check
     raise_error = mock.Mock()
     raise_error.side_effect = requests.HTTPError('health check failed')
-    with mock.patch("requests.get", return_value=mock.MagicMock(raise_for_status=raise_error)):
+    with mock.patch('requests.Session.get', return_value=mock.MagicMock(raise_for_status=raise_error)):
         check._perform_service_check(instance)
 
     check.service_check.assert_has_calls(calls)

kube_scheduler/tests/test_sli_metrics.py

@@ -22,7 +22,7 @@ def mock_metrics():
     with open(f_name, 'r') as f:
         text_data = f.read()
     with mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
         ),
@@ -97,23 +97,23 @@ def mock_request():
 
 
 def test_detect_sli_endpoint(mock_metrics, instance):
-    with mock.patch('requests.get') as mock_request:
+    with mock.patch('requests.Session.get') as mock_request:
         mock_request.return_value.status_code = 200
         c = KubeSchedulerCheck(CHECK_NAME, {}, [instance])
         c.check(instance)
         assert c._slis_available is True
 
 
 def test_detect_sli_endpoint_404(mock_metrics, instance):
-    with mock.patch('requests.get') as mock_request:
+    with mock.patch('requests.Session.get') as mock_request:
         mock_request.return_value.status_code = 404
         c = KubeSchedulerCheck(CHECK_NAME, {}, [instance])
         c.check(instance)
         assert c._slis_available is False
 
 
 def test_detect_sli_endpoint_403(mock_metrics, instance):
-    with mock.patch('requests.get') as mock_request:
+    with mock.patch('requests.Session.get') as mock_request:
         mock_request.return_value.status_code = 403
         c = KubeSchedulerCheck(CHECK_NAME, {}, [instance])
         c.check(instance)

kubelet/tests/test_kubelet.py

@@ -563,7 +563,7 @@ def test_kubelet_credentials_update(monkeypatch, aggregator):
     get = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: mock_from_file('kubelet_metrics_1_14.txt').splitlines()
     )
-    with mock.patch('requests.get', return_value=get):
+    with mock.patch('requests.Session.get', return_value=get):
         check.check(instance)
 
     assert check._http_handlers[instance['kubelet_metrics_endpoint']].options['verify'] is True
@@ -573,7 +573,7 @@ def test_kubelet_credentials_update(monkeypatch, aggregator):
         status_code=200, iter_lines=lambda **kwargs: mock_from_file('kubelet_metrics_1_14.txt').splitlines()
     )
     kubelet_conn_info = {'url': 'http://127.0.0.1:10255', 'ca_cert': False}
-    with mock.patch('requests.get', return_value=get), mock.patch(
+    with mock.patch('requests.Session.get', return_value=get), mock.patch(
         'datadog_checks.kubelet.kubelet.get_connection_info', return_value=kubelet_conn_info
     ):
         check.check(instance)
@@ -1049,7 +1049,7 @@ def test_perform_kubelet_check(monkeypatch):
 
     instance_tags = ["one:1"]
     get = MockedResponse()
-    with mock.patch("requests.get", side_effect=get):
+    with mock.patch('requests.Session.get', side_effect=get):
         check._perform_kubelet_check(instance_tags)
 
     get.assert_has_calls(
@@ -1093,7 +1093,7 @@ def test_report_node_metrics_kubernetes1_18(monkeypatch, aggregator):
 
     get = mock.MagicMock(status_code=404, iter_lines=lambda **kwargs: "Error Code")
     get.raise_for_status.side_effect = requests.HTTPError('error')
-    with mock.patch('requests.get', return_value=get):
+    with mock.patch('requests.Session.get', return_value=get):
         check._report_node_metrics(['foo:bar'])
         aggregator.assert_all_metrics_covered()
 

powerdns_recursor/tests/test_metadata.py

@@ -24,19 +24,19 @@ def test_metadata_unit(datadog_agent):
 
     config_obj, tags = check._get_config(instance)
 
-    with mock.patch('requests.get', side_effect=requests.exceptions.Timeout()):
+    with mock.patch('requests.Session.get', side_effect=requests.exceptions.Timeout()):
         check._collect_metadata(config_obj)
         datadog_agent.assert_metadata_count(0)
         check.log.debug.assert_called_with('Error collecting PowerDNS Recursor version: %s', '')
 
     datadog_agent.reset()
-    with mock.patch('requests.get', return_value=MockResponse()):
+    with mock.patch('requests.Session.get', return_value=MockResponse()):
         check._collect_metadata(config_obj)
         datadog_agent.assert_metadata_count(0)
         check.log.debug.assert_called_with("Couldn't find the PowerDNS Recursor Server version header")
 
     datadog_agent.reset()
-    with mock.patch('requests.get', return_value=MockResponse(headers={'Server': 'wrong_stuff'})):
+    with mock.patch('requests.Session.get', return_value=MockResponse(headers={'Server': 'wrong_stuff'})):
         check._collect_metadata(config_obj)
         datadog_agent.assert_metadata_count(0)
         check.log.debug.assert_called_with(