couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject [50/50] [abbrv] couch-replicator commit: updated refs/heads/1963-eunit-bigcouch to 3cf0b13
Date Thu, 28 Aug 2014 17:30:50 GMT
Switch to using config instead of couch_config


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/6d34c4ed
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/6d34c4ed
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/6d34c4ed

Branch: refs/heads/1963-eunit-bigcouch
Commit: 6d34c4ed32cfdec274a8aab27b7c94c818110c7d
Parents: 270bdc1
Author: Russell Branca <chewbranca@apache.org>
Authored: Wed Aug 27 16:41:46 2014 -0700
Committer: Russell Branca <chewbranca@apache.org>
Committed: Thu Aug 28 10:29:41 2014 -0700

----------------------------------------------------------------------
 test/couch_replicator_compact_tests.erl         | 2 +-
 test/couch_replicator_httpc_pool_tests.erl      | 4 ++--
 test/couch_replicator_large_atts_tests.erl      | 4 ++--
 test/couch_replicator_many_leaves_tests.erl     | 2 +-
 test/couch_replicator_missing_stubs_tests.erl   | 2 +-
 test/couch_replicator_use_checkpoints_tests.erl | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/6d34c4ed/test/couch_replicator_compact_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_compact_tests.erl b/test/couch_replicator_compact_tests.erl
index 09140ed..f9529d6 100644
--- a/test/couch_replicator_compact_tests.erl
+++ b/test/couch_replicator_compact_tests.erl
@@ -292,7 +292,7 @@ check_ref_counter(Type, #db{name = Name, fd_ref_counter = OldRefCounter})
->
 
 db_url(DbName) ->
     iolist_to_binary([
-        "http://", couch_config:get("httpd", "bind_address", "127.0.0.1"),
+        "http://", config:get("httpd", "bind_address", "127.0.0.1"),
         ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)),
         "/", DbName
     ]).

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/6d34c4ed/test/couch_replicator_httpc_pool_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_httpc_pool_tests.erl b/test/couch_replicator_httpc_pool_tests.erl
index d067f94..ea36f7f 100644
--- a/test/couch_replicator_httpc_pool_tests.erl
+++ b/test/couch_replicator_httpc_pool_tests.erl
@@ -164,8 +164,8 @@ loop(Parent, Ref, Worker, Pool) ->
     end.
 
 spawn_pool() ->
-    Host = couch_config:get("httpd", "bind_address", "127.0.0.1"),
-    Port = couch_config:get("httpd", "port", "5984"),
+    Host = config:get("httpd", "bind_address", "127.0.0.1"),
+    Port = config:get("httpd", "port", "5984"),
     {ok, Pool} = couch_replicator_httpc_pool:start_link(
         "http://" ++ Host ++ ":" ++ Port, [{max_connections, 3}]),
     Pool.

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/6d34c4ed/test/couch_replicator_large_atts_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_large_atts_tests.erl b/test/couch_replicator_large_atts_tests.erl
index 71293d8..e8c0d1a 100644
--- a/test/couch_replicator_large_atts_tests.erl
+++ b/test/couch_replicator_large_atts_tests.erl
@@ -33,8 +33,8 @@ setup(local) ->
 setup(remote) ->
     {remote, setup()};
 setup({A, B}) ->
-    couch_config:set("attachments", "compressible_types", "text/*", false),
     ok = test_util:start_couch(),
+    config:set("attachments", "compressible_types", "text/*", false),
     Source = setup(A),
     Target = setup(B),
     {Source, Target}.
@@ -191,7 +191,7 @@ att_decoded_md5(Att) ->
 
 db_url(DbName) ->
     iolist_to_binary([
-        "http://", couch_config:get("httpd", "bind_address", "127.0.0.1"),
+        "http://", config:get("httpd", "bind_address", "127.0.0.1"),
         ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)),
         "/", DbName
     ]).

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/6d34c4ed/test/couch_replicator_many_leaves_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_many_leaves_tests.erl b/test/couch_replicator_many_leaves_tests.erl
index cf56440..04d21ac 100644
--- a/test/couch_replicator_many_leaves_tests.erl
+++ b/test/couch_replicator_many_leaves_tests.erl
@@ -202,7 +202,7 @@ add_attachments(SourceDb, NumAtts,  [{DocId, NumConflicts} | Rest]) ->
 
 db_url(DbName) ->
     iolist_to_binary([
-        "http://", couch_config:get("httpd", "bind_address", "127.0.0.1"),
+        "http://", config:get("httpd", "bind_address", "127.0.0.1"),
         ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)),
         "/", DbName
     ]).

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/6d34c4ed/test/couch_replicator_missing_stubs_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_missing_stubs_tests.erl b/test/couch_replicator_missing_stubs_tests.erl
index df8685e..db95451 100644
--- a/test/couch_replicator_missing_stubs_tests.erl
+++ b/test/couch_replicator_missing_stubs_tests.erl
@@ -230,7 +230,7 @@ att_decoded_md5(Att) ->
 
 db_url(DbName) ->
     iolist_to_binary([
-        "http://", couch_config:get("httpd", "bind_address", "127.0.0.1"),
+        "http://", config:get("httpd", "bind_address", "127.0.0.1"),
         ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)),
         "/", DbName
     ]).

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/6d34c4ed/test/couch_replicator_use_checkpoints_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_use_checkpoints_tests.erl b/test/couch_replicator_use_checkpoints_tests.erl
index edb8ec1..5b5668d 100644
--- a/test/couch_replicator_use_checkpoints_tests.erl
+++ b/test/couch_replicator_use_checkpoints_tests.erl
@@ -169,7 +169,7 @@ compare_dbs(Source, Target) ->
 
 db_url(DbName) ->
     iolist_to_binary([
-        "http://", couch_config:get("httpd", "bind_address", "127.0.0.1"),
+        "http://", config:get("httpd", "bind_address", "127.0.0.1"),
         ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)),
         "/", DbName
     ]).


Mime
View raw message