[tor-commits] [tor/master] Add hs-ipv6 to the chutney IPv6 tests

[nickm at torproject.org]

commit 26b47f80dd87b3684d43bd6d1b4b9f4d773eed75
Author: teor <teor2345 at gmail.com>
Date:   Tue Sep 6 13:45:09 2016 +1000

    Add hs-ipv6 to the chutney IPv6 tests
    
    Requires a recent version of chutney.
    
    Also remove bridges+hs, as it's somewhat redundant.
---
 changes/feature20069 | 6 ++++++
 src/test/include.am  | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/feature20069 b/changes/feature20069
new file mode 100644
index 0000000..039fb75
--- /dev/null
+++ b/changes/feature20069
@@ -0,0 +1,6 @@
+  o Minor feature (testing, ipv6):
+    - Add the hs-ipv6 chutney target to make test-network-all's IPv6
+      tests. Remove bridges+hs, as it's somewhat redundant.
+      This requires a recent chutney version that supports IPv6 clients,
+      relays, and authorities.
+      Closes ticket 20069; patch by teor.
diff --git a/src/test/include.am b/src/test/include.am
index 2e91f7c..0aff395 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -28,9 +28,9 @@ TESTS += src/test/test 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-min bridges+hs
+TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min
 # only run if we can ping6 ::1 (localhost)
-TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min
+TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-ipv6
 # only run if we can find a stable (or simply another) version of tor
 TEST_CHUTNEY_FLAVORS_MIXED = mixed