You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2011/04/21 03:31:28 UTC
svn commit: r1095587 - in /couchdb/branches/1.0.x/test/etap:
030-doc-from-json.t 031-doc-to-json.t 081-config-override.t
083-config-no-files.t 113-replication-attachment-comp.t
140-attachment-comp.t test_util.erl.in
Author: davisp
Date: Thu Apr 21 01:31:27 2011
New Revision: 1095587
URL: http://svn.apache.org/viewvc?rev=1095587&view=rev
Log:
Don't persist config values in etap tests.
This breaks VPATH builds.
Modified:
couchdb/branches/1.0.x/test/etap/030-doc-from-json.t
couchdb/branches/1.0.x/test/etap/031-doc-to-json.t
couchdb/branches/1.0.x/test/etap/081-config-override.t
couchdb/branches/1.0.x/test/etap/083-config-no-files.t
couchdb/branches/1.0.x/test/etap/113-replication-attachment-comp.t
couchdb/branches/1.0.x/test/etap/140-attachment-comp.t
couchdb/branches/1.0.x/test/etap/test_util.erl.in
Modified: couchdb/branches/1.0.x/test/etap/030-doc-from-json.t
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/test/etap/030-doc-from-json.t?rev=1095587&r1=1095586&r2=1095587&view=diff
==============================================================================
--- couchdb/branches/1.0.x/test/etap/030-doc-from-json.t (original)
+++ couchdb/branches/1.0.x/test/etap/030-doc-from-json.t Thu Apr 21 01:31:27 2011
@@ -34,7 +34,7 @@ main(_) ->
test() ->
couch_config:start_link(test_util:config_files()),
- couch_config:set("attachments", "compression_level", "0"),
+ couch_config:set("attachments", "compression_level", "0", false),
ok = test_from_json_success(),
ok = test_from_json_errors(),
ok.
Modified: couchdb/branches/1.0.x/test/etap/031-doc-to-json.t
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/test/etap/031-doc-to-json.t?rev=1095587&r1=1095586&r2=1095587&view=diff
==============================================================================
--- couchdb/branches/1.0.x/test/etap/031-doc-to-json.t (original)
+++ couchdb/branches/1.0.x/test/etap/031-doc-to-json.t Thu Apr 21 01:31:27 2011
@@ -34,7 +34,7 @@ main(_) ->
test() ->
couch_config:start_link(test_util:config_files()),
- couch_config:set("attachments", "compression_level", "0"),
+ couch_config:set("attachments", "compression_level", "0", false),
ok = test_to_json_success(),
ok.
Modified: couchdb/branches/1.0.x/test/etap/081-config-override.t
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/test/etap/081-config-override.t?rev=1095587&r1=1095586&r2=1095587&view=diff
==============================================================================
--- couchdb/branches/1.0.x/test/etap/081-config-override.t (original)
+++ couchdb/branches/1.0.x/test/etap/081-config-override.t Thu Apr 21 01:31:27 2011
@@ -148,7 +148,7 @@ test() ->
),
etap:is(
- couch_config:set("httpd", "port", "8080"),
+ couch_config:set("httpd", "port", "8080", false),
ok,
"Writing {httpd, port} is kosher."
),
Modified: couchdb/branches/1.0.x/test/etap/083-config-no-files.t
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/test/etap/083-config-no-files.t?rev=1095587&r1=1095586&r2=1095587&view=diff
==============================================================================
--- couchdb/branches/1.0.x/test/etap/083-config-no-files.t (original)
+++ couchdb/branches/1.0.x/test/etap/083-config-no-files.t Thu Apr 21 01:31:27 2011
@@ -45,7 +45,7 @@ test() ->
"Created a new non-persisted k/v pair."
),
- ok = couch_config:set("httpd", "bind_address", "127.0.0.1"),
+ ok = couch_config:set("httpd", "bind_address", "127.0.0.1", false),
etap:is(
couch_config:get("httpd", "bind_address"),
"127.0.0.1",
Modified: couchdb/branches/1.0.x/test/etap/113-replication-attachment-comp.t
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/test/etap/113-replication-attachment-comp.t?rev=1095587&r1=1095586&r2=1095587&view=diff
==============================================================================
--- couchdb/branches/1.0.x/test/etap/113-replication-attachment-comp.t (original)
+++ couchdb/branches/1.0.x/test/etap/113-replication-attachment-comp.t Thu Apr 21 01:31:27 2011
@@ -55,14 +55,14 @@ test() ->
create_db(test_db_b_name()),
% enable compression
- couch_config:set("attachments", "compression_level", "8"),
- couch_config:set("attachments", "compressible_types", "text/*"),
+ couch_config:set("attachments", "compression_level", "8", false),
+ couch_config:set("attachments", "compressible_types", "text/*", false),
% store doc with text attachment in DB A
put_text_att(test_db_a_name()),
% disable attachment compression
- couch_config:set("attachments", "compression_level", "0"),
+ couch_config:set("attachments", "compression_level", "0", false),
% do pull replication
do_pull_replication(test_db_a_name(), test_db_b_name()),
@@ -82,14 +82,14 @@ test() ->
create_db(test_db_b_name()),
% enable compression
- couch_config:set("attachments", "compression_level", "8"),
- couch_config:set("attachments", "compressible_types", "text/*"),
+ couch_config:set("attachments", "compression_level", "8", false),
+ couch_config:set("attachments", "compressible_types", "text/*", false),
% store doc with text attachment in DB A
put_text_att(test_db_a_name()),
% disable attachment compression
- couch_config:set("attachments", "compression_level", "0"),
+ couch_config:set("attachments", "compression_level", "0", false),
% do push replication
do_push_replication(test_db_a_name(), test_db_b_name()),
@@ -109,14 +109,14 @@ test() ->
create_db(test_db_b_name()),
% enable compression
- couch_config:set("attachments", "compression_level", "8"),
- couch_config:set("attachments", "compressible_types", "text/*"),
+ couch_config:set("attachments", "compression_level", "8", false),
+ couch_config:set("attachments", "compressible_types", "text/*", false),
% store doc with text attachment in DB A
put_text_att(test_db_a_name()),
% disable attachment compression
- couch_config:set("attachments", "compression_level", "0"),
+ couch_config:set("attachments", "compression_level", "0", false),
% do local-local replication
do_local_replication(test_db_a_name(), test_db_b_name()),
Modified: couchdb/branches/1.0.x/test/etap/140-attachment-comp.t
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/test/etap/140-attachment-comp.t?rev=1095587&r1=1095586&r2=1095587&view=diff
==============================================================================
--- couchdb/branches/1.0.x/test/etap/140-attachment-comp.t (original)
+++ couchdb/branches/1.0.x/test/etap/140-attachment-comp.t Thu Apr 21 01:31:27 2011
@@ -38,8 +38,8 @@ test() ->
couch_server:delete(test_db_name(), []),
couch_db:create(test_db_name(), []),
- couch_config:set("attachments", "compression_level", "8"),
- couch_config:set("attachments", "compressible_types", "text/*"),
+ couch_config:set("attachments", "compression_level", "8", false),
+ couch_config:set("attachments", "compressible_types", "text/*", false),
create_1st_text_att(),
create_1st_png_att(),
Modified: couchdb/branches/1.0.x/test/etap/test_util.erl.in
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/test/etap/test_util.erl.in?rev=1095587&r1=1095586&r2=1095587&view=diff
==============================================================================
--- couchdb/branches/1.0.x/test/etap/test_util.erl.in (original)
+++ couchdb/branches/1.0.x/test/etap/test_util.erl.in Thu Apr 21 01:31:27 2011
@@ -36,7 +36,7 @@ build_file(Name) ->
config_files() ->
[
build_file("etc/couchdb/default_dev.ini"),
- source_file("test/etap/random_port.ini"),
- build_file("etc/couchdb/local_dev.ini")
+ build_file("etc/couchdb/local_dev.ini"),
+ source_file("test/etap/random_port.ini")
].