From 2bffa1e205c499768abd767f0ec4d6f0dc745e85 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Mon, 13 Dec 2021 12:58:32 -0800 Subject: [PATCH] Fix cname_lookup test c.badtest.com actually has a CNAME now, and apparently we're actually doing the look-up during tests. Change-Id: I306b7d05740a2b8fcef2f5f432ebf5211bc723cc (cherry picked from commit 54fc8a7dee4ad7a38944cbd4c2e3b5f2ec393765) --- test/unit/common/middleware/test_cname_lookup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/unit/common/middleware/test_cname_lookup.py b/test/unit/common/middleware/test_cname_lookup.py index 4e1a72f98e..2dbea66540 100644 --- a/test/unit/common/middleware/test_cname_lookup.py +++ b/test/unit/common/middleware/test_cname_lookup.py @@ -305,7 +305,9 @@ class TestCNAMELookup(unittest.TestCase): resp = do_test('c.badtest.com') self.assertEqual(resp, bad_domain) - def test_host_is_storage_domain(self): + @mock.patch('dns.resolver.Resolver.query', + side_effect=dns.exception.DNSException) + def test_host_is_storage_domain(self, mock_lookup): conf = {'storage_domain': 'storage.example.com', 'lookup_depth': 2} app = cname_lookup.CNAMELookupMiddleware(FakeApp(), conf) @@ -318,9 +320,12 @@ class TestCNAMELookup(unittest.TestCase): bad_domain = [b'CNAME lookup failed to resolve to a valid domain'] resp = do_test('c.badtest.com') self.assertEqual(resp, bad_domain) + self.assertEqual(1, len(mock_lookup.mock_calls)) + mock_lookup.reset_mock() resp = do_test('storage.example.com') self.assertEqual(resp, [b'FAKE APP']) + self.assertEqual(0, len(mock_lookup.mock_calls)) def test_resolution_to_storage_domain_exactly(self): conf = {'storage_domain': 'example.com',