Repository: couchdb-couch-replicator
Updated Branches:
  refs/heads/master fb6826fe7 -> 4de038dc3


Use ADMIN_CTX macro from couch_db.hrl


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/4de038dc
Tree: 
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/4de038dc
Diff: 
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/4de038dc

Branch: refs/heads/master
Commit: 4de038dc38c5e3525c4ecf9d47ecbd2e070c638a
Parents: fb6826f
Author: Alexander Shorin <[email protected]>
Authored: Mon Jan 26 07:18:15 2015 +0300
Committer: Alexander Shorin <[email protected]>
Committed: Mon Jan 26 07:18:15 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/4de038dc/test/couch_replicator_compact_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_compact_tests.erl 
b/test/couch_replicator_compact_tests.erl
index 55db96a..e070b14 100644
--- a/test/couch_replicator_compact_tests.erl
+++ b/test/couch_replicator_compact_tests.erl
@@ -25,7 +25,7 @@
 
 setup() ->
     DbName = ?tempdb(),
-    {ok, Db} = couch_db:create(DbName, [?ADMIN_USER]),
+    {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]),
     ok = couch_db:close(Db),
     DbName.
 
@@ -42,7 +42,7 @@ setup({A, B}) ->
 teardown({remote, DbName}) ->
     teardown(DbName);
 teardown(DbName) ->
-    ok = couch_server:delete(DbName, [?ADMIN_USER]),
+    ok = couch_server:delete(DbName, [?ADMIN_CTX]),
     ok.
 
 teardown(_, {Source, Target}) ->
@@ -311,7 +311,7 @@ replicate(Source, Target) ->
         {<<"target">>, Target},
         {<<"continuous">>, true}
     ]},
-    {ok, Rep} = couch_replicator_utils:parse_rep_doc(RepObject, ?ADMIN_ROLE),
+    {ok, Rep} = couch_replicator_utils:parse_rep_doc(RepObject, ?ADMIN_USER),
     {ok, Pid} = couch_replicator:async_replicate(Rep),
     {ok, Pid, Rep#rep.id}.
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/4de038dc/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 3b5c2e8..58af91b 100644
--- a/test/couch_replicator_large_atts_tests.erl
+++ b/test/couch_replicator_large_atts_tests.erl
@@ -30,7 +30,7 @@
 
 setup() ->
     DbName = ?tempdb(),
-    {ok, Db} = couch_db:create(DbName, [?ADMIN_USER]),
+    {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]),
     ok = couch_db:close(Db),
     DbName.
 
@@ -48,7 +48,7 @@ setup({A, B}) ->
 teardown({remote, DbName}) ->
     teardown(DbName);
 teardown(DbName) ->
-    ok = couch_server:delete(DbName, [?ADMIN_USER]),
+    ok = couch_server:delete(DbName, [?ADMIN_CTX]),
     ok.
 
 teardown(_, {Source, Target}) ->

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/4de038dc/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 c7b99ba..ad5e358 100644
--- a/test/couch_replicator_many_leaves_tests.erl
+++ b/test/couch_replicator_many_leaves_tests.erl
@@ -29,7 +29,7 @@
 
 setup() ->
     DbName = ?tempdb(),
-    {ok, Db} = couch_db:create(DbName, [?ADMIN_USER]),
+    {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]),
     ok = couch_db:close(Db),
     DbName.
 
@@ -46,7 +46,7 @@ setup({A, B}) ->
 teardown({remote, DbName}) ->
     teardown(DbName);
 teardown(DbName) ->
-    ok = couch_server:delete(DbName, [?ADMIN_USER]),
+    ok = couch_server:delete(DbName, [?ADMIN_CTX]),
     ok.
 
 teardown(_, {Source, Target}) ->
@@ -212,7 +212,7 @@ replicate(Source, Target) ->
         {<<"source">>, Source},
         {<<"target">>, Target}
     ]},
-    {ok, Rep} = couch_replicator_utils:parse_rep_doc(RepObject, ?ADMIN_ROLE),
+    {ok, Rep} = couch_replicator_utils:parse_rep_doc(RepObject, ?ADMIN_USER),
     {ok, Pid} = couch_replicator:async_replicate(Rep),
     MonRef = erlang:monitor(process, Pid),
     receive

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/4de038dc/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 a7798c1..451809d 100644
--- a/test/couch_replicator_missing_stubs_tests.erl
+++ b/test/couch_replicator_missing_stubs_tests.erl
@@ -27,7 +27,7 @@
 
 setup() ->
     DbName = ?tempdb(),
-    {ok, Db} = couch_db:create(DbName, [?ADMIN_USER]),
+    {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]),
     ok = couch_db:close(Db),
     DbName.
 
@@ -44,7 +44,7 @@ setup({A, B}) ->
 teardown({remote, DbName}) ->
     teardown(DbName);
 teardown(DbName) ->
-    ok = couch_server:delete(DbName, [?ADMIN_USER]),
+    ok = couch_server:delete(DbName, [?ADMIN_CTX]),
     ok.
 
 teardown(_, {Source, Target}) ->
@@ -95,7 +95,7 @@ should_set_target_revs_limit({remote, Target}, RevsLimit) ->
     should_set_target_revs_limit(Target, RevsLimit);
 should_set_target_revs_limit(Target, RevsLimit) ->
     ?_test(begin
-        {ok, Db} = couch_db:open_int(Target, [?ADMIN_USER]),
+        {ok, Db} = couch_db:open_int(Target, [?ADMIN_CTX]),
         ?assertEqual(ok, couch_db:set_revs_limit(Db, RevsLimit)),
         ok = couch_db:close(Db)
     end).

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/4de038dc/test/couch_replicator_test_helper.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_test_helper.erl 
b/test/couch_replicator_test_helper.erl
index 519c7d0..1c0ce3e 100644
--- a/test/couch_replicator_test_helper.erl
+++ b/test/couch_replicator_test_helper.erl
@@ -98,7 +98,7 @@ replicate(Source, Target) ->
         {<<"source">>, Source},
         {<<"target">>, Target}
     ]},
-    {ok, Rep} = couch_replicator_utils:parse_rep_doc(RepObject, ?ADMIN_ROLE),
+    {ok, Rep} = couch_replicator_utils:parse_rep_doc(RepObject, ?ADMIN_USER),
     {ok, Pid} = couch_replicator:async_replicate(Rep),
     MonRef = erlang:monitor(process, Pid),
     receive

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/4de038dc/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 a1e5581..a63e974 100644
--- a/test/couch_replicator_use_checkpoints_tests.erl
+++ b/test/couch_replicator_use_checkpoints_tests.erl
@@ -43,7 +43,7 @@ stop(_, _) ->
 
 setup() ->
     DbName = ?tempdb(),
-    {ok, Db} = couch_db:create(DbName, [?ADMIN_USER]),
+    {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]),
     ok = couch_db:close(Db),
     DbName.
 
@@ -61,7 +61,7 @@ setup({_, Fun, {A, B}}) ->
 teardown({remote, DbName}) ->
     teardown(DbName);
 teardown(DbName) ->
-    ok = couch_server:delete(DbName, [?ADMIN_USER]),
+    ok = couch_server:delete(DbName, [?ADMIN_CTX]),
     ok.
 
 teardown(_, {Source, Target, Listener}) ->
@@ -181,7 +181,7 @@ replicate(Source, Target, UseCheckpoints) ->
         {<<"target">>, Target},
         {<<"use_checkpoints">>, UseCheckpoints}
     ]},
-    {ok, Rep} = couch_replicator_utils:parse_rep_doc(RepObject, ?ADMIN_ROLE),
+    {ok, Rep} = couch_replicator_utils:parse_rep_doc(RepObject, ?ADMIN_USER),
     {ok, Pid} = couch_replicator:async_replicate(Rep),
     MonRef = erlang:monitor(process, Pid),
     receive

Reply via email to