[tor-commits] [tor/release-0.3.5] test: Don't run HSv2 Chutney test networks

[dgoulet at torproject.org]

commit f9750249ac5e851792c170af0869a8c3cf4c9def
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Sep 30 11:12:46 2021 -0400

    test: Don't run HSv2 Chutney test networks
    
    Part of #40476
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/test/include.am | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/test/include.am b/src/test/include.am
index 75861fb9ef..c13c5f2c2d 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -51,15 +51,12 @@ TESTS += src/test/test-slow src/test/test-memwipe \
 	$(TESTSCRIPTS)
 
 # These flavors are run using automake's test-driver and test-network.sh
-TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \
-	single-onion-v23
+TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v3-min single-onion-v3
 # only run if we can ping6 ::1 (localhost)
-# IPv6-only v3 single onion services don't work yet, so we don't test the
-# single-onion-v23-ipv6-md flavor
-TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
-	single-onion-ipv6-md
+# IPv6-only v3 single onion services don't work yet.
+TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v3-ipv6
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v3
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.