Revert rename: mock_http_client → mock_http

The fixture name mock_http_client was added in the previous commit, but the
team prefers the shorter mock_http name. Revert all usages across integrations
and the fixture definition in http_testing.py.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: mwdd146980

couchbase/tests/conftest.py

@@ -10,7 +10,7 @@
 import pytest
 import requests
 
-from datadog_checks.base.utils.http_testing import MockHTTPResponse, mock_http_client  # noqa: F401
+from datadog_checks.base.utils.http_testing import MockHTTPResponse, mock_http  # noqa: F401
 from datadog_checks.couchbase import Couchbase
 from datadog_checks.dev import WaitFor, docker_run
 from datadog_checks.dev.docker import get_container_ip

couchbase/tests/test_unit.py

@@ -124,8 +124,8 @@ def test_extract_index_tags(instance, test_input, expected_tags):
     assert eval(str(test_output)) == expected_tags
 
 
-def test_unit(dd_run_check, check, instance, mock_http_client, aggregator):
-    mock_http_client.get.side_effect = mock_http_responses
+def test_unit(dd_run_check, check, instance, mock_http, aggregator):
+    mock_http.get.side_effect = mock_http_responses
 
     dd_run_check(check(instance))
 
@@ -140,8 +140,8 @@ def test_unit(dd_run_check, check, instance, mock_http_client, aggregator):
     aggregator.assert_metrics_using_metadata(get_metadata_metrics())
 
 
-def test_unit_query_metrics(dd_run_check, check, instance_query, mock_http_client, aggregator):
-    mock_http_client.get.side_effect = mock_http_responses
+def test_unit_query_metrics(dd_run_check, check, instance_query, mock_http, aggregator):
+    mock_http.get.side_effect = mock_http_responses
 
     dd_run_check(check(instance_query))
 

datadog_checks_base/datadog_checks/base/utils/http_testing.py

@@ -8,11 +8,11 @@
 
 import pytest
 
-__all__ = ['MockHTTPResponse', 'mock_http_client']
+__all__ = ['MockHTTPResponse', 'mock_http']
 
 
 @pytest.fixture
-def mock_http_client(mocker):
+def mock_http(mocker):
     """Intercept HTTP calls made through RequestsWrapper; import into integration conftest.py to use.
 
     Patches get/post/put/delete/head/patch at the RequestsWrapper class level so all three

datadog_checks_base/tests/conftest.py

@@ -3,7 +3,7 @@
 import pytest
 import requests
 
-from datadog_checks.base.utils.http_testing import mock_http_client  # noqa: F401
+from datadog_checks.base.utils.http_testing import mock_http  # noqa: F401
 from datadog_checks.base.utils.platform import Platform
 from datadog_checks.dev import TempDir, docker_run, get_here
 from datadog_checks.dev.conditions import CheckDockerLogs, WaitFor

falco/tests/conftest.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from datadog_checks.base.utils.http_testing import mock_http_client  # noqa: F401
+from datadog_checks.base.utils.http_testing import mock_http  # noqa: F401
 from datadog_checks.dev import docker_run
 from datadog_checks.dev.conditions import CheckEndpoints
 

falco/tests/test_unit.py

@@ -20,8 +20,8 @@ def test_empty_instance(dd_run_check):
         dd_run_check(check)
 
 
-def test_check_falco(dd_run_check, aggregator, instance, mock_http_client):
-    mock_http_client.get.side_effect = [
+def test_check_falco(dd_run_check, aggregator, instance, mock_http):
+    mock_http.get.side_effect = [
         MockHTTPResponse(file_path=get_fixture_path("falco_metrics.txt")),
     ]
     dd_run_check(FalcoCheck('falco', {}, [instance]))

ray/tests/conftest.py

@@ -10,7 +10,7 @@
 import pytest
 import requests
 
-from datadog_checks.base.utils.http_testing import mock_http_client  # noqa: F401
+from datadog_checks.base.utils.http_testing import mock_http  # noqa: F401
 from datadog_checks.dev import EnvVars, TempDir, docker_run
 from datadog_checks.dev._env import get_state, save_state
 from datadog_checks.dev.conditions import CheckEndpoints, WaitFor

ray/tests/test_unit.py

@@ -16,8 +16,8 @@
         pytest.param(MOCKED_WORKER_INSTANCE, WORKER_METRICS, id='worker'),
     ],
 )
-def test_check(dd_run_check, aggregator, mock_http_client, check, instance, metrics):
-    mock_http_client.get.side_effect = mock_http_responses
+def test_check(dd_run_check, aggregator, mock_http, check, instance, metrics):
+    mock_http.get.side_effect = mock_http_responses
     dd_run_check(check(instance))
 
     for expected_metric in metrics:
@@ -30,10 +30,10 @@ def test_check(dd_run_check, aggregator, mock_http_client, check, instance, metr
     assert len(aggregator.service_check_names) == 1
 
 
-def test_invalid_url(dd_run_check, aggregator, check, mocked_head_instance, mock_http_client):
+def test_invalid_url(dd_run_check, aggregator, check, mocked_head_instance, mock_http):
     mocked_head_instance["openmetrics_endpoint"] = "http://unknowwn"
 
-    mock_http_client.get.side_effect = mock_http_responses
+    mock_http.get.side_effect = mock_http_responses
     with pytest.raises(Exception):
         dd_run_check(check(mocked_head_instance))
 

strimzi/tests/conftest.py

@@ -8,7 +8,7 @@
 
 import pytest
 
-from datadog_checks.base.utils.http_testing import MockHTTPResponse, mock_http_client  # noqa: F401
+from datadog_checks.base.utils.http_testing import MockHTTPResponse, mock_http  # noqa: F401
 from datadog_checks.dev import run_command
 from datadog_checks.dev.kind import kind_run
 from datadog_checks.dev.kube_port_forward import port_forward

strimzi/tests/test_unit.py

@@ -54,9 +54,9 @@ def test_check_unique_operator(
     instance,
     metrics,
     tag,
-    mock_http_client,
+    mock_http,
 ):
-    mock_http_client.get.side_effect = mock_http_responses
+    mock_http.get.side_effect = mock_http_responses
     dd_run_check(check(instance))
 
     for expected_metric in metrics:
@@ -75,8 +75,8 @@ def test_check_unique_operator(
     assert len(aggregator.service_check_names) == 1
 
 
-def test_check_all_operators(dd_run_check, aggregator, check, mock_http_client):
-    mock_http_client.get.side_effect = mock_http_responses
+def test_check_all_operators(dd_run_check, aggregator, check, mock_http):
+    mock_http.get.side_effect = mock_http_responses
     dd_run_check(
         check(
             {