aboutsummaryrefslogtreecommitdiff
path: root/src/test/conf_examples/pt_08
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-07 11:44:51 +1000
committerteor <teor@torproject.org>2019-11-07 11:44:51 +1000
commita0820bc00df38883555a6307f2e1fe3bdf32ef81 (patch)
tree76fb58cc8041fcad64e7cdf74bb65ef1968efdce /src/test/conf_examples/pt_08
parentaaef9a2519d81c016bc1f58272121ed908fbff10 (diff)
downloadtor-a0820bc00df38883555a6307f2e1fe3bdf32ef81.tar.gz
tor-a0820bc00df38883555a6307f2e1fe3bdf32ef81.zip
test/parseconf: Update config parsing tests for 32410
Diffstat (limited to 'src/test/conf_examples/pt_08')
-rw-r--r--src/test/conf_examples/pt_08/error_no_dirauth_relay1
-rw-r--r--src/test/conf_examples/pt_08/expected_no_dirauth_relay2
-rw-r--r--src/test/conf_examples/pt_08/torrc2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/test/conf_examples/pt_08/error_no_dirauth_relay b/src/test/conf_examples/pt_08/error_no_dirauth_relay
deleted file mode 100644
index 9f9c0fd8f3..0000000000
--- a/src/test/conf_examples/pt_08/error_no_dirauth_relay
+++ /dev/null
@@ -1 +0,0 @@
-This tor was built with relay mode disabled.
diff --git a/src/test/conf_examples/pt_08/expected_no_dirauth_relay b/src/test/conf_examples/pt_08/expected_no_dirauth_relay
new file mode 100644
index 0000000000..9a1a9bd1e4
--- /dev/null
+++ b/src/test/conf_examples/pt_08/expected_no_dirauth_relay
@@ -0,0 +1,2 @@
+ExtORPort unix:/
+ServerTransportPlugin bad3 exec /
diff --git a/src/test/conf_examples/pt_08/torrc b/src/test/conf_examples/pt_08/torrc
index bf36a185a4..6f1d79d706 100644
--- a/src/test/conf_examples/pt_08/torrc
+++ b/src/test/conf_examples/pt_08/torrc
@@ -1,5 +1,7 @@
# Relay PT tests
# Options from relay/transport_config.c
# Try an invalid config with a unix socket for ExtORPort
+# (Unless the relay module is disabled, because they are relay-only
+# options. We'll ignore all relay-only options in #32395.)
ExtORPort unix:/
ServerTransportPlugin bad3 exec /