aboutsummaryrefslogtreecommitdiff
path: root/src/test/conf_examples/pt_06
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-12 15:10:07 +1000
committerteor <teor@torproject.org>2019-11-14 12:57:34 +1000
commitced434c5869da6d6c7ac4c11a934a4d58a730afe (patch)
tree70e2e09460322afb4eaa2e4b42166b2a317ccf49 /src/test/conf_examples/pt_06
parentc7838c71fb3d023c8e255896118c59ed8af688eb (diff)
downloadtor-ced434c5869da6d6c7ac4c11a934a4d58a730afe.tar.gz
tor-ced434c5869da6d6c7ac4c11a934a4d58a730afe.zip
test/parseconf: Update conf_examples to use expected_log
Part of 32451.
Diffstat (limited to 'src/test/conf_examples/pt_06')
-rw-r--r--src/test/conf_examples/pt_06/expected_log1
-rw-r--r--src/test/conf_examples/pt_06/expected_log_no_dirauth_relay1
-rw-r--r--src/test/conf_examples/pt_06/expected_no_dirauth_relay6
3 files changed, 8 insertions, 0 deletions
diff --git a/src/test/conf_examples/pt_06/expected_log b/src/test/conf_examples/pt_06/expected_log
new file mode 100644
index 0000000000..5b3ab51d25
--- /dev/null
+++ b/src/test/conf_examples/pt_06/expected_log
@@ -0,0 +1 @@
+Tor is not configured as a relay but you specified a ServerTransportPlugin line.*The ServerTransportPlugin line will be ignored
diff --git a/src/test/conf_examples/pt_06/expected_log_no_dirauth_relay b/src/test/conf_examples/pt_06/expected_log_no_dirauth_relay
new file mode 100644
index 0000000000..f35a380c9f
--- /dev/null
+++ b/src/test/conf_examples/pt_06/expected_log_no_dirauth_relay
@@ -0,0 +1 @@
+Read configuration file .*pt_06[./]*torrc
diff --git a/src/test/conf_examples/pt_06/expected_no_dirauth_relay b/src/test/conf_examples/pt_06/expected_no_dirauth_relay
new file mode 100644
index 0000000000..d5788b92c9
--- /dev/null
+++ b/src/test/conf_examples/pt_06/expected_no_dirauth_relay
@@ -0,0 +1,6 @@
+ExtORPortCookieAuthFile /
+ExtORPortCookieAuthFileGroupReadable 1
+ExtORPort 1
+ServerTransportListenAddr bad3 127.0.0.1:2
+ServerTransportOptions bad3 a=b
+ServerTransportPlugin bad3 exec /