aboutsummaryrefslogtreecommitdiff
path: root/src/test/conf_examples/nss_1
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/nss_1
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/nss_1')
-rw-r--r--src/test/conf_examples/nss_1/expected0
-rw-r--r--src/test/conf_examples/nss_1/expected_log (renamed from src/test/conf_examples/nss_1/error)0
-rw-r--r--src/test/conf_examples/nss_1/expected_log_nss (renamed from src/test/conf_examples/nss_1/error_nss)0
-rw-r--r--src/test/conf_examples/nss_1/expected_nss0
-rw-r--r--src/test/conf_examples/nss_1/torrc5
5 files changed, 1 insertions, 4 deletions
diff --git a/src/test/conf_examples/nss_1/expected b/src/test/conf_examples/nss_1/expected
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/test/conf_examples/nss_1/expected
diff --git a/src/test/conf_examples/nss_1/error b/src/test/conf_examples/nss_1/expected_log
index 32e8cfc2f8..32e8cfc2f8 100644
--- a/src/test/conf_examples/nss_1/error
+++ b/src/test/conf_examples/nss_1/expected_log
diff --git a/src/test/conf_examples/nss_1/error_nss b/src/test/conf_examples/nss_1/expected_log_nss
index c0fe7b003c..c0fe7b003c 100644
--- a/src/test/conf_examples/nss_1/error_nss
+++ b/src/test/conf_examples/nss_1/expected_log_nss
diff --git a/src/test/conf_examples/nss_1/expected_nss b/src/test/conf_examples/nss_1/expected_nss
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/test/conf_examples/nss_1/expected_nss
diff --git a/src/test/conf_examples/nss_1/torrc b/src/test/conf_examples/nss_1/torrc
index 91a4656b77..f873d79028 100644
--- a/src/test/conf_examples/nss_1/torrc
+++ b/src/test/conf_examples/nss_1/torrc
@@ -1,4 +1 @@
-# Deliberately bad options, to cause an error message
-# But this test actually checks for the optional library list in tor's logs,
-# not the error message
-bad bad bad \ No newline at end of file
+# This test checks for the optional library list in tor's logs