aboutsummaryrefslogtreecommitdiff
path: root/src/test/conf_examples/badnick_1
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/badnick_1
parentaaef9a2519d81c016bc1f58272121ed908fbff10 (diff)
downloadtor-a0820bc00df38883555a6307f2e1fe3bdf32ef81.tar.gz
tor-a0820bc00df38883555a6307f2e1fe3bdf32ef81.zip
test/parseconf: Update config parsing tests for 32410
Diffstat (limited to 'src/test/conf_examples/badnick_1')
-rw-r--r--src/test/conf_examples/badnick_1/error_no_dirauth_relay1
-rw-r--r--src/test/conf_examples/badnick_1/expected_no_dirauth_relay1
-rw-r--r--src/test/conf_examples/badnick_1/torrc2
3 files changed, 3 insertions, 1 deletions
diff --git a/src/test/conf_examples/badnick_1/error_no_dirauth_relay b/src/test/conf_examples/badnick_1/error_no_dirauth_relay
deleted file mode 100644
index 9f9c0fd8f3..0000000000
--- a/src/test/conf_examples/badnick_1/error_no_dirauth_relay
+++ /dev/null
@@ -1 +0,0 @@
-This tor was built with relay mode disabled.
diff --git a/src/test/conf_examples/badnick_1/expected_no_dirauth_relay b/src/test/conf_examples/badnick_1/expected_no_dirauth_relay
new file mode 100644
index 0000000000..b00be15c2e
--- /dev/null
+++ b/src/test/conf_examples/badnick_1/expected_no_dirauth_relay
@@ -0,0 +1 @@
+Nickname TooManyCharactersInThisNickname
diff --git a/src/test/conf_examples/badnick_1/torrc b/src/test/conf_examples/badnick_1/torrc
index 41ee4894f1..087e3f2ff1 100644
--- a/src/test/conf_examples/badnick_1/torrc
+++ b/src/test/conf_examples/badnick_1/torrc
@@ -1,2 +1,4 @@
# This nickname is too long; we won't accept it.
+# (Unless the relay module is disabled, because Nickname is a
+# relay-only option. We'll ignore all relay-only options in #32395.)
Nickname TooManyCharactersInThisNickname