[tor-commits] [tor/master] Makefile: Use chutney's latest default network

[teor at torproject.org]

commit 02f494360a71959c8f81a6015a42965d95b2818c
Author: teor <teor at torproject.org>
Date:   Thu Feb 13 12:33:42 2020 +1000

    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.
---
 changes/ticket28208 | 4 ++++
 src/test/include.am | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket28208 b/changes/ticket28208
new file mode 100644
index 000000000..8818aad1d
--- /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 47e8d8fb0..fdd1195fd 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