[tor-commits] [tor/master] Add an integration test for options disabled by dirauth subsystem.

[nickm at torproject.org]

commit 8d474e4dc5e4088eb26fc0dd665f22d0cfb06abf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 15 19:05:17 2019 -0500

    Add an integration test for options disabled by dirauth subsystem.
---
 src/test/conf_examples/dirauth_2/expected                      | 1 +
 src/test/conf_examples/dirauth_2/expected_log                  | 1 +
 src/test/conf_examples/dirauth_2/expected_log_no_dirauth       | 1 +
 src/test/conf_examples/dirauth_2/expected_log_no_dirauth_relay | 1 +
 src/test/conf_examples/dirauth_2/expected_no_dirauth           | 0
 src/test/conf_examples/dirauth_2/expected_no_dirauth_relay     | 0
 src/test/conf_examples/dirauth_2/torrc                         | 5 +++++
 7 files changed, 9 insertions(+)

diff --git a/src/test/conf_examples/dirauth_2/expected b/src/test/conf_examples/dirauth_2/expected
new file mode 100644
index 000000000..19ab024ed
--- /dev/null
+++ b/src/test/conf_examples/dirauth_2/expected
@@ -0,0 +1 @@
+AuthDirMaxServersPerAddr 8
diff --git a/src/test/conf_examples/dirauth_2/expected_log b/src/test/conf_examples/dirauth_2/expected_log
new file mode 100644
index 000000000..88611fee9
--- /dev/null
+++ b/src/test/conf_examples/dirauth_2/expected_log
@@ -0,0 +1 @@
+Read configuration file
diff --git a/src/test/conf_examples/dirauth_2/expected_log_no_dirauth b/src/test/conf_examples/dirauth_2/expected_log_no_dirauth
new file mode 100644
index 000000000..01110c5d8
--- /dev/null
+++ b/src/test/conf_examples/dirauth_2/expected_log_no_dirauth
@@ -0,0 +1 @@
+This copy of Tor was built without support for the option "AuthDirMaxServersPerAddr". Skipping.
\ No newline at end of file
diff --git a/src/test/conf_examples/dirauth_2/expected_log_no_dirauth_relay b/src/test/conf_examples/dirauth_2/expected_log_no_dirauth_relay
new file mode 100644
index 000000000..01110c5d8
--- /dev/null
+++ b/src/test/conf_examples/dirauth_2/expected_log_no_dirauth_relay
@@ -0,0 +1 @@
+This copy of Tor was built without support for the option "AuthDirMaxServersPerAddr". Skipping.
\ No newline at end of file
diff --git a/src/test/conf_examples/dirauth_2/expected_no_dirauth b/src/test/conf_examples/dirauth_2/expected_no_dirauth
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/conf_examples/dirauth_2/expected_no_dirauth_relay b/src/test/conf_examples/dirauth_2/expected_no_dirauth_relay
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/conf_examples/dirauth_2/torrc b/src/test/conf_examples/dirauth_2/torrc
new file mode 100644
index 000000000..bd1cdbc8b
--- /dev/null
+++ b/src/test/conf_examples/dirauth_2/torrc
@@ -0,0 +1,5 @@
+#
+# This will get accepted if the module is enabled, and ignored if the module
+# is disabled.
+#
+AuthDirMaxServersPerAddr 8