aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-02-13 12:33:42 +1000
committerteor <teor@torproject.org>2020-02-13 13:00:18 +1000
commit02f494360a71959c8f81a6015a42965d95b2818c (patch)
treea39ab358e293652906451dae4c10a5a491bdbc13
parent9d352028e60fa5b2b239f6ce0803c2b1b0cb5d84 (diff)
downloadtor-02f494360a71959c8f81a6015a42965d95b2818c.tar.gz
tor-02f494360a71959c8f81a6015a42965d95b2818c.zip
Makefile: Use chutney's latest default network
Use bridges+hs-v23 for "make test-network", rather than using chutney's old default. This change requires a recent version of chutney, because the old bridges+hs-v23 did not work. (See chutney's 33302 for details.) Closes 28208.
-rw-r--r--changes/ticket282084
-rw-r--r--src/test/include.am2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/ticket28208 b/changes/ticket28208
new file mode 100644
index 0000000000..8818aad1d5
--- /dev/null
+++ b/changes/ticket28208
@@ -0,0 +1,4 @@
+ o Testing:
+ - Use the "bridges+hs-v23" chutney network flavor in "make test-network".
+ This test requires a recent version of chutney (mid-February 2020).
+ Closes ticket 28208.
diff --git a/src/test/include.am b/src/test/include.am
index 47e8d8fb09..fdd1195fdf 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -64,7 +64,7 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
# run a quick test or two
# this test only uses IPv4
-TEST_CHUTNEY_FLAVOR_QUICK = bridges+hs-v2
+TEST_CHUTNEY_FLAVOR_QUICK = bridges+hs-v23
# only run if we can ping6 ::1 (localhost)
TEST_CHUTNEY_FLAVOR_QUICK_IPV6 = client-ipv6-only-md