aboutsummaryrefslogtreecommitdiff
path: root/src/test/conf_examples/relay_34
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-01-14 21:49:29 +1000
committerteor <teor@torproject.org>2020-03-21 04:07:03 +1000
commite0eec3bf29cbd5f1d4588040d9f83aa54450291c (patch)
treec8a767a9315f5a651848d9383188121d208c1db4 /src/test/conf_examples/relay_34
parent4b914dea025806b47ba91e5e0a713fb266805a27 (diff)
downloadtor-e0eec3bf29cbd5f1d4588040d9f83aa54450291c.tar.gz
tor-e0eec3bf29cbd5f1d4588040d9f83aa54450291c.zip
parseconf: Add ORPort and DirPort auto tests
These tests don't actually trigger bug 32588, but they do increase the coverage of the auto port config code. Tests for 32588.
Diffstat (limited to 'src/test/conf_examples/relay_34')
-rw-r--r--src/test/conf_examples/relay_34/error_no_dirauth_relay1
-rw-r--r--src/test/conf_examples/relay_34/expected4
-rw-r--r--src/test/conf_examples/relay_34/expected_log1
-rw-r--r--src/test/conf_examples/relay_34/torrc5
4 files changed, 11 insertions, 0 deletions
diff --git a/src/test/conf_examples/relay_34/error_no_dirauth_relay b/src/test/conf_examples/relay_34/error_no_dirauth_relay
new file mode 100644
index 0000000000..9f9c0fd8f3
--- /dev/null
+++ b/src/test/conf_examples/relay_34/error_no_dirauth_relay
@@ -0,0 +1 @@
+This tor was built with relay mode disabled.
diff --git a/src/test/conf_examples/relay_34/expected b/src/test/conf_examples/relay_34/expected
new file mode 100644
index 0000000000..bccde684f3
--- /dev/null
+++ b/src/test/conf_examples/relay_34/expected
@@ -0,0 +1,4 @@
+DirPort 127.0.0.1:auto
+Nickname Unnamed
+ORPort 127.0.0.1:auto
+ORPort [::1]:auto
diff --git a/src/test/conf_examples/relay_34/expected_log b/src/test/conf_examples/relay_34/expected_log
new file mode 100644
index 0000000000..d5478c1a15
--- /dev/null
+++ b/src/test/conf_examples/relay_34/expected_log
@@ -0,0 +1 @@
+Your ContactInfo config option is not set \ No newline at end of file
diff --git a/src/test/conf_examples/relay_34/torrc b/src/test/conf_examples/relay_34/torrc
new file mode 100644
index 0000000000..01010a5c38
--- /dev/null
+++ b/src/test/conf_examples/relay_34/torrc
@@ -0,0 +1,5 @@
+# Relay tests
+# explicit IPv4 ORPort and DirPort auto and IPv6 ORPort auto
+ORPort 127.0.0.1:auto
+ORPort [::1]:auto
+DirPort 127.0.0.1:auto