Don't rely on implicit default config values for tests.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3fd7500f Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3fd7500f Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3fd7500f Branch: refs/heads/1744-single-config-file Commit: 3fd7500f28f8065ea814a9b0d88b039d11e32f38 Parents: 1c03622 Author: Alexander Shorin <[email protected]> Authored: Sun Jul 7 19:28:31 2013 +0400 Committer: Alexander Shorin <[email protected]> Committed: Sun Jul 7 20:26:53 2013 +0400 ---------------------------------------------------------------------- share/www/script/test/config.js | 1 - test/etap/081-config-override.1.ini | 2 +- test/etap/081-config-override.t | 13 +++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/3fd7500f/share/www/script/test/config.js ---------------------------------------------------------------------- diff --git a/share/www/script/test/config.js b/share/www/script/test/config.js index 193aa89..fe44e80 100644 --- a/share/www/script/test/config.js +++ b/share/www/script/test/config.js @@ -53,7 +53,6 @@ couchTests.config = function(debug) { T(config.couchdb.database_dir); T(config.daemons.httpd); T(config.httpd_global_handlers._config); - T(config.log.level); T(config.query_servers.javascript); // test that settings can be altered, and that an undefined whitelist allows any change http://git-wip-us.apache.org/repos/asf/couchdb/blob/3fd7500f/test/etap/081-config-override.1.ini ---------------------------------------------------------------------- diff --git a/test/etap/081-config-override.1.ini b/test/etap/081-config-override.1.ini index 55451da..65f30c5 100644 --- a/test/etap/081-config-override.1.ini +++ b/test/etap/081-config-override.1.ini @@ -16,7 +16,7 @@ ; under the License. [couchdb] -max_dbs_open=10 +delayed_commits=false [httpd] port=4895 http://git-wip-us.apache.org/repos/asf/couchdb/blob/3fd7500f/test/etap/081-config-override.t ---------------------------------------------------------------------- diff --git a/test/etap/081-config-override.t b/test/etap/081-config-override.t index 01f8b4c..ec54d55 100755 --- a/test/etap/081-config-override.t +++ b/test/etap/081-config-override.t @@ -58,9 +58,10 @@ test() -> CheckDefaults = fun() -> etap:is( - couch_config:get("couchdb", "max_dbs_open"), - "100", - "{couchdb, max_dbs_open} is 100 by defualt." + couch_config:get("couchdb", "delayed_commits"), + "true", + "{couchdb, delayed_commits} is true by default." + %% actually it should be false by default, but this is another story ), etap:is( @@ -83,9 +84,9 @@ test() -> CheckOverride = fun() -> etap:is( - couch_config:get("couchdb", "max_dbs_open"), - "10", - "{couchdb, max_dbs_open} was overriden with the value 10" + couch_config:get("couchdb", "delayed_commits"), + "false", + "{couchdb, delayed_commits} was overridden with the value false" ), etap:is(
