Skip to content

Commit

Permalink
🔧 disable doq cert validation due to no default ca available in GHA u…
Browse files Browse the repository at this point in the history 
…buntu through python default ctx
  • Loading branch information
@Ousret
Ousret committed Nov 7, 2024
1 parent 5ef28a0 commit 82c6790
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 20 deletions.
23 changes: 13 additions & 10 deletions test/contrib/asynchronous/test_resolver.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ async def test_null_resolver(hostname: str, expect_error: bool) -> None:
("dou://1.1.1.1", PlainResolver),
("dox://ooooo.com", None),
("doh://dns.google/resolve", HTTPSResolver),
("doq://dns.nextdns.io/?timeout=3", QUICResolver),
("doq://dns.nextdns.io/?timeout=3&cert_reqs=0", QUICResolver),
("dns://dns.nextdns.io", None),
("null://default", NullResolver),
("default://null", None),
Expand All @@ -82,7 +82,10 @@ async def test_null_resolver(hostname: str, expect_error: bool) -> None:
("dot://1.1.1.1/?implementation=nonexistent", None),
("system://", SystemResolver),
("dot://", None),
("doq://dns.nextdns.io/?implementation=qh3&timeout=1", QUICResolver),
(
"doq://dns.nextdns.io/?implementation=qh3&timeout=1&cert_reqs=0",
QUICResolver,
),
],
)
@pytest.mark.asyncio
Expand Down Expand Up @@ -121,7 +124,7 @@ async def test_url_resolver(
"system://default",
"dot://dns.google",
"dot://one.one.one.one",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"doh+google://",
"doh+cloudflare://default",
],
Expand Down Expand Up @@ -156,7 +159,7 @@ async def test_1_1_1_1_ipv4_resolution_across_protocols(dns_url: str) -> None:
"doh://dns.google",
"dot://dns.google",
"dot://one.one.one.one",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
],
)
@pytest.mark.parametrize(
Expand Down Expand Up @@ -291,7 +294,7 @@ async def test_many_resolver_host_constraint_distribution() -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down Expand Up @@ -377,7 +380,7 @@ async def test_doh_rfc8484(dns_url: str) -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down Expand Up @@ -461,7 +464,7 @@ async def test_many_resolver_task_safe() -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down Expand Up @@ -497,7 +500,7 @@ async def test_resolver_recycle(dns_url: str) -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand All @@ -521,7 +524,7 @@ async def test_resolve_cannot_recycle_when_available(dns_url: str) -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down Expand Up @@ -559,7 +562,7 @@ async def test_ipv6_always_preferred(dns_url: str) -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down
23 changes: 13 additions & 10 deletions test/contrib/test_resolver.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def test_null_resolver(hostname: str, expect_error: bool) -> None:
("dou://1.1.1.1", PlainResolver),
("dox://ooooo.com", None),
("doh://dns.google/resolve", HTTPSResolver),
("doq://dns.nextdns.io/?timeout=3", QUICResolver),
("doq://dns.nextdns.io/?timeout=3&cert_reqs=0", QUICResolver),
("dns://dns.nextdns.io", None),
("null://default", NullResolver),
("default://null", None),
Expand All @@ -82,7 +82,10 @@ def test_null_resolver(hostname: str, expect_error: bool) -> None:
("dot://1.1.1.1/?implementation=nonexistent", None),
("system://", SystemResolver),
("dot://", None),
("doq://dns.nextdns.io/?implementation=qh3&timeout=1", QUICResolver),
(
"doq://dns.nextdns.io/?implementation=qh3&timeout=1&cert_reqs=0",
QUICResolver,
),
],
)
def test_url_resolver(
Expand Down Expand Up @@ -120,7 +123,7 @@ def test_url_resolver(
"system://default",
"dot://dns.google",
"dot://one.one.one.one",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"doh+google://",
"doh+cloudflare://default",
],
Expand Down Expand Up @@ -153,7 +156,7 @@ def test_1_1_1_1_ipv4_resolution_across_protocols(dns_url: str) -> None:
"doh://dns.google",
"dot://dns.google",
"dot://one.one.one.one",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
],
)
@pytest.mark.parametrize(
Expand Down Expand Up @@ -283,7 +286,7 @@ def test_many_resolver_host_constraint_distribution() -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down Expand Up @@ -367,7 +370,7 @@ def test_doh_rfc8484(dns_url: str) -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down Expand Up @@ -469,7 +472,7 @@ def _run(
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down Expand Up @@ -504,7 +507,7 @@ def test_resolver_recycle(dns_url: str) -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand All @@ -527,7 +530,7 @@ def test_resolve_cannot_recycle_when_available(dns_url: str) -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down Expand Up @@ -564,7 +567,7 @@ def test_ipv6_always_preferred(dns_url: str) -> None:
[
"doh+google://",
"doh+cloudflare://",
"doq://dns.nextdns.io/?timeout=3",
"doq://dns.nextdns.io/?timeout=3&cert_reqs=0",
"dot://one.one.one.one",
"dou://one.one.one.one",
],
Expand Down

0 comments on commit 82c6790

Please sign in to comment.