aboutsummaryrefslogtreecommitdiff
path: root/src/test/conf_examples/ops_4
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-09-12 16:42:03 -0400
committerNick Mathewson <nickm@torproject.org>2019-09-14 19:00:41 -0400
commit850a00dc07d33c6bd9af660281b4fd1baa6a0a6f (patch)
treec191803d61fabed55754c05f74934ab502881578 /src/test/conf_examples/ops_4
parent2f7be9620b92e922b91e079d6d5cf216ff1509db (diff)
downloadtor-850a00dc07d33c6bd9af660281b4fd1baa6a0a6f.tar.gz
tor-850a00dc07d33c6bd9af660281b4fd1baa6a0a6f.zip
Add test for +Option, /Option, and Option
Here we use these directives to replace, extend, or clear values in torrc.defaults and in torrc.
Diffstat (limited to 'src/test/conf_examples/ops_4')
-rw-r--r--src/test/conf_examples/ops_4/expected2
-rw-r--r--src/test/conf_examples/ops_4/torrc3
-rw-r--r--src/test/conf_examples/ops_4/torrc.defaults1
3 files changed, 6 insertions, 0 deletions
diff --git a/src/test/conf_examples/ops_4/expected b/src/test/conf_examples/ops_4/expected
new file mode 100644
index 0000000000..bf52f6a330
--- /dev/null
+++ b/src/test/conf_examples/ops_4/expected
@@ -0,0 +1,2 @@
+Nickname Unnamed
+ORPort 9099
diff --git a/src/test/conf_examples/ops_4/torrc b/src/test/conf_examples/ops_4/torrc
new file mode 100644
index 0000000000..dcec2aa95d
--- /dev/null
+++ b/src/test/conf_examples/ops_4/torrc
@@ -0,0 +1,3 @@
+# This value is unadorned, so replaces the one from defaults.torrc.
+
+ORPort 9099
diff --git a/src/test/conf_examples/ops_4/torrc.defaults b/src/test/conf_examples/ops_4/torrc.defaults
new file mode 100644
index 0000000000..04cd0393c6
--- /dev/null
+++ b/src/test/conf_examples/ops_4/torrc.defaults
@@ -0,0 +1 @@
+ORPort 9000