[tor-commits] [tor/master] parseconf: Add an authority IPv6 ORPort test

[nickm@xxxxxxxxxxxxxx]

commit 82010b0e2e995b3a4c7030c5f2339480a7f1e48e
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Wed Jan 15 21:20:57 2020 +1000

    parseconf: Add an authority IPv6 ORPort test
    
    These tests don't actually exercise the authority IPv6 ORPort
    self-add feature in 32822, but they do improve coverage of the
    related config code.
    
    Part of 32822.
---
 src/test/conf_examples/dirauth_3/error_no_dirauth       |  1 +
 src/test/conf_examples/dirauth_3/error_no_dirauth_relay |  1 +
 src/test/conf_examples/dirauth_3/expected               |  9 +++++++++
 src/test/conf_examples/dirauth_3/expected_log           |  1 +
 src/test/conf_examples/dirauth_3/torrc                  | 13 +++++++++++++
 5 files changed, 25 insertions(+)

diff --git a/src/test/conf_examples/dirauth_3/error_no_dirauth b/src/test/conf_examples/dirauth_3/error_no_dirauth
new file mode 100644
index 000000000..e6bd5db69
--- /dev/null
+++ b/src/test/conf_examples/dirauth_3/error_no_dirauth
@@ -0,0 +1 @@
+This tor was built with dirauth mode disabled.
diff --git a/src/test/conf_examples/dirauth_3/error_no_dirauth_relay b/src/test/conf_examples/dirauth_3/error_no_dirauth_relay
new file mode 100644
index 000000000..e6bd5db69
--- /dev/null
+++ b/src/test/conf_examples/dirauth_3/error_no_dirauth_relay
@@ -0,0 +1 @@
+This tor was built with dirauth mode disabled.
diff --git a/src/test/conf_examples/dirauth_3/expected b/src/test/conf_examples/dirauth_3/expected
new file mode 100644
index 000000000..23eac3a5f
--- /dev/null
+++ b/src/test/conf_examples/dirauth_3/expected
@@ -0,0 +1,9 @@
+Address 192.0.2.1
+AuthoritativeDirectory 1
+ContactInfo tor_parse_test@xxxxxxxxxxx
+DirPort 192.0.2.1:2
+DownloadExtraInfo 1
+Nickname Unnamed
+ORPort 192.0.2.1:1
+ORPort [2001:DB8::1]:3
+V3AuthoritativeDirectory 1
diff --git a/src/test/conf_examples/dirauth_3/expected_log b/src/test/conf_examples/dirauth_3/expected_log
new file mode 100644
index 000000000..3127c9b12
--- /dev/null
+++ b/src/test/conf_examples/dirauth_3/expected_log
@@ -0,0 +1 @@
+Read configuration file .*dirauth_3[./]*torrc
diff --git a/src/test/conf_examples/dirauth_3/torrc b/src/test/conf_examples/dirauth_3/torrc
new file mode 100644
index 000000000..9663a9bc0
--- /dev/null
+++ b/src/test/conf_examples/dirauth_3/torrc
@@ -0,0 +1,13 @@
+# Authority with IPv6 address
+
+AuthoritativeDirectory 1
+V3AuthoritativeDirectory 1
+
+ContactInfo tor_parse_test@xxxxxxxxxxx
+
+Address 192.0.2.1
+
+ORPort 192.0.2.1:1
+DirPort 192.0.2.1:2
+
+ORPort [2001:DB8::1]:3



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits