From 07e37469637fb42fc0a8e8c35e6f63b188c4d137 Mon Sep 17 00:00:00 2001 From: Alex Lopez Date: Mon, 5 Jun 2023 15:33:41 +0200 Subject: [PATCH] Mock out httpbin.org responses to fix flaky tests (#14630) --- .../checks/openmetrics/test_legacy/test_openmetrics.py | 4 ++-- .../tests/base/checks/prometheus/test_prometheus.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/datadog_checks_base/tests/base/checks/openmetrics/test_legacy/test_openmetrics.py b/datadog_checks_base/tests/base/checks/openmetrics/test_legacy/test_openmetrics.py index 16d02d7e5e2cc..51b20a1339124 100644 --- a/datadog_checks_base/tests/base/checks/openmetrics/test_legacy/test_openmetrics.py +++ b/datadog_checks_base/tests/base/checks/openmetrics/test_legacy/test_openmetrics.py @@ -2678,7 +2678,7 @@ def test_ssl_verify_not_raise_warning(caplog, mocked_openmetrics_check_factory, check = mocked_openmetrics_check_factory(instance) scraper_config = check.get_scraper_config(instance) - with caplog.at_level(logging.DEBUG): + with caplog.at_level(logging.DEBUG), mock.patch('requests.get', return_value=MockResponse('httpbin.org')): resp = check.send_request('https://httpbin.org/get', scraper_config) assert "httpbin.org" in resp.content.decode('utf-8') @@ -2703,7 +2703,7 @@ def test_send_request_with_dynamic_prometheus_url(caplog, mocked_openmetrics_che # `prometheus_url` changed just before calling `send_request` scraper_config['prometheus_url'] = 'https://www.example.com/foo/bar' - with caplog.at_level(logging.DEBUG): + with caplog.at_level(logging.DEBUG), mock.patch('requests.get', return_value=MockResponse('httpbin.org')): resp = check.send_request('https://httpbin.org/get', scraper_config) assert "httpbin.org" in resp.content.decode('utf-8') diff --git a/datadog_checks_base/tests/base/checks/prometheus/test_prometheus.py b/datadog_checks_base/tests/base/checks/prometheus/test_prometheus.py index a27950bb0643b..5634e0e27cf0a 100644 --- a/datadog_checks_base/tests/base/checks/prometheus/test_prometheus.py +++ b/datadog_checks_base/tests/base/checks/prometheus/test_prometheus.py @@ -1964,9 +1964,11 @@ def test_text_filter_input(): def test_ssl_verify_not_raise_warning(caplog, mocked_prometheus_check, text_data): + from datadog_checks.dev.http import MockResponse + check = mocked_prometheus_check - with caplog.at_level(logging.DEBUG): + with caplog.at_level(logging.DEBUG), mock.patch('requests.get', return_value=MockResponse('httpbin.org')): resp = check.poll('https://httpbin.org/get') assert 'httpbin.org' in resp.content.decode('utf-8') @@ -1977,10 +1979,12 @@ def test_ssl_verify_not_raise_warning(caplog, mocked_prometheus_check, text_data def test_ssl_verify_not_raise_warning_cert_false(caplog, mocked_prometheus_check, text_data): + from datadog_checks.dev.http import MockResponse + check = mocked_prometheus_check check.ssl_ca_cert = False - with caplog.at_level(logging.DEBUG): + with caplog.at_level(logging.DEBUG), mock.patch('requests.get', return_value=MockResponse('httpbin.org')): resp = check.poll('https://httpbin.org/get') assert 'httpbin.org' in resp.content.decode('utf-8')