summaryrefslogtreecommitdiff
path: root/test/sample.conf
diff options
context:
space:
mode:
authorPeter Portante <peter.portante@redhat.com>2014-04-10 15:37:15 -0400
committerPeter Portante <peter.portante@redhat.com>2014-04-14 19:05:25 -0400
commit4dd2670fb03b491a106e399791ef21783721ebc9 (patch)
treec2bc406d8dbc8e8367889b52eca52f6c8d7dedfd /test/sample.conf
parente0108af54f2a6c3be156c21645ccdbdcb3645225 (diff)
downloadswift-4dd2670fb03b491a106e399791ef21783721ebc9.tar.gz
Load constraints from cluster info dictionary
Use constrainst from the new "swift-constraints" section of test.conf, fall back to those found in the response to the /info API call, ultimately falling back to the constraints module's effective constraints. Change-Id: Iea01c9c4b5148faa10004a240df411cbe7336a6a
Diffstat (limited to 'test/sample.conf')
-rw-r--r--test/sample.conf44
1 files changed, 30 insertions, 14 deletions
diff --git a/test/sample.conf b/test/sample.conf
index 161a588aa..bb6bf8b00 100644
--- a/test/sample.conf
+++ b/test/sample.conf
@@ -1,5 +1,5 @@
[func_test]
-# sample config
+# sample config for Swift with tempauth
auth_host = 127.0.0.1
auth_port = 8080
auth_ssl = no
@@ -25,11 +25,32 @@ password2 = testing2
username3 = tester3
password3 = testing3
-# If not defined here, the test runner will try to use the default constraint
-# values as constructed by the constraints module, which will attempt to get
-# them from /etc/swift/swift.conf, if possible. Then, if the swift.conf file
-# isn't found, the test runner will skip tests that depend on those values.
-# Note that the cluster must have "sane" values for the test suite to pass.
+collate = C
+
+[unit_test]
+fake_syslog = False
+
+[probe_test]
+# check_server_timeout = 30
+# validate_rsync = false
+
+[swift-constraints]
+# The functional test runner will try to use the constraint values provided in
+# the swift-constraints section of test.conf.
+#
+# If a constraint value does not exist in that section, or because the
+# swift-constraints section does not exist, the constraints values found in
+# the /info API call (if successful) will be used.
+#
+# If a constraint value cannot be found in the /info results, either because
+# the /info API call failed, or a value is not present, the constraint value
+# used will fall back to those loaded by the constraints module at time of
+# import (which will attempt to load /etc/swift/swift.conf, see the
+# swift.common.constraints module for more information).
+#
+# Note that the cluster must have "sane" values for the test suite to pass
+# (for some definition of sane).
+#
#max_file_size = 5368709122
#max_meta_name_length = 128
#max_meta_value_length = 256
@@ -42,11 +63,6 @@ password3 = testing3
#max_account_name_length = 256
#max_container_name_length = 256
-collate = C
-
-[unit_test]
-fake_syslog = False
-
-[probe_test]
-# check_server_timeout = 30
-# validate_rsync = false
+# Newer swift versions default to strict cors mode, but older ones were the
+# opposite.
+#strict_cors_mode = true