From aedb97ee8790f4275c674e12d86d9059bc03b309 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Wed, 2 Apr 2025 10:07:01 +0200 Subject: [PATCH] dnsdist: Enable the DoQ and DoH3 parts of the SNI tests in our CI We now build with Quiche >= 0.23.2 so we can enable them. --- regression-tests.dnsdist/runtests | 2 ++ regression-tests.dnsdist/test_SNI.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/regression-tests.dnsdist/runtests b/regression-tests.dnsdist/runtests index 40e65aaa7f..b796beca37 100755 --- a/regression-tests.dnsdist/runtests +++ b/regression-tests.dnsdist/runtests @@ -2,6 +2,8 @@ set -e export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python +# requires Quiche >= 0.23.2 +export ENABLE_SNI_TESTS_WITH_QUICHE=yes if [ ! -d .venv ]; then python3 -m venv .venv diff --git a/regression-tests.dnsdist/test_SNI.py b/regression-tests.dnsdist/test_SNI.py index ac2f221040..25611cb875 100644 --- a/regression-tests.dnsdist/test_SNI.py +++ b/regression-tests.dnsdist/test_SNI.py @@ -39,7 +39,7 @@ class TestSNI(DNSDistTest): _config_params = ['_testServerPort', '_tlsServerPort', '_serverCert', '_serverKey', '_dohWithNGHTTP2ServerPort', '_serverCert', '_serverKey', '_doqServerPort', '_serverCert', '_serverKey', '_doh3ServerPort', '_serverCert', '_serverKey', '_serverName'] # enable these once Quiche > 0.22 is available, including https://github.com/cloudflare/quiche/pull/1895 - @unittest.skipUnless('ENABLE_SNI_TESTS_WITH_QUICHE' in os.environ, "SNI tests with Quicheare disabled") + @unittest.skipUnless('ENABLE_SNI_TESTS_WITH_QUICHE' in os.environ, "SNI tests with Quiche are disabled") def testServerNameIndicationWithQuiche(self): name = 'simple.sni.tests.powerdns.com.' query = dns.message.make_query(name, 'A', 'IN', use_edns=False) -- 2.47.2