couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject [19/22] couch-mrview commit: updated refs/heads/1963-eunit-bigcouch to cc9c436
Date Thu, 28 Aug 2014 17:27:41 GMT
Use ?ADMIN macros from couch_eunit.hrl


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/7857cf8e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/7857cf8e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/7857cf8e

Branch: refs/heads/1963-eunit-bigcouch
Commit: 7857cf8ebbaa717c078c59d9f4604bc31409d494
Parents: b4e490f
Author: Russell Branca <chewbranca@apache.org>
Authored: Wed Aug 27 17:17:15 2014 -0700
Committer: Russell Branca <chewbranca@apache.org>
Committed: Thu Aug 28 10:27:05 2014 -0700

----------------------------------------------------------------------
 src/couch_mrview_test_util.erl         | 4 ++--
 test/couch_mrview_all_docs_tests.erl   | 1 -
 test/couch_mrview_collation_tests.erl  | 1 -
 test/couch_mrview_compact_tests.erl    | 1 -
 test/couch_mrview_index_info_tests.erl | 1 -
 test/couch_mrview_map_views_tests.erl  | 1 -
 test/couch_mrview_red_views_tests.erl  | 1 -
 7 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/7857cf8e/src/couch_mrview_test_util.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_test_util.erl b/src/couch_mrview_test_util.erl
index 4109fd6..7599786 100644
--- a/src/couch_mrview_test_util.erl
+++ b/src/couch_mrview_test_util.erl
@@ -15,7 +15,7 @@
 -compile(export_all).
 
 -include_lib("couch/include/couch_db.hrl").
--define(ADMIN, #user_ctx{roles=[<<"_admin">>]}).
+-include_lib("couch/include/couch_eunit.hrl").
 
 
 init_db(Name, Type) ->
@@ -29,7 +29,7 @@ init_db(Name, Type, Count) ->
 
 
 new_db(Name, Type) ->
-    couch_server:delete(Name, [{user_ctx, ?ADMIN}]),
+    couch_server:delete(Name, [?ADMIN_USER]),
     {ok, Db} = couch_db:create(Name, [{user_ctx, ?ADMIN}]),
     save_docs(Db, [ddoc(Type)]).
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/7857cf8e/test/couch_mrview_all_docs_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_mrview_all_docs_tests.erl b/test/couch_mrview_all_docs_tests.erl
index c7f24bd..0b40587 100644
--- a/test/couch_mrview_all_docs_tests.erl
+++ b/test/couch_mrview_all_docs_tests.erl
@@ -15,7 +15,6 @@
 -include_lib("couch/include/couch_eunit.hrl").
 -include_lib("couch/include/couch_db.hrl").
 
--define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).
 -define(TIMEOUT, 1000).
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/7857cf8e/test/couch_mrview_collation_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_mrview_collation_tests.erl b/test/couch_mrview_collation_tests.erl
index cd017b2..ae0d821 100644
--- a/test/couch_mrview_collation_tests.erl
+++ b/test/couch_mrview_collation_tests.erl
@@ -15,7 +15,6 @@
 -include_lib("couch/include/couch_eunit.hrl").
 -include_lib("couch/include/couch_db.hrl").
 
--define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).
 -define(TIMEOUT, 1000).
 -define(VALUES, [
     null,

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/7857cf8e/test/couch_mrview_compact_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_mrview_compact_tests.erl b/test/couch_mrview_compact_tests.erl
index 3c51138..4085d4f 100644
--- a/test/couch_mrview_compact_tests.erl
+++ b/test/couch_mrview_compact_tests.erl
@@ -15,7 +15,6 @@
 -include_lib("couch/include/couch_eunit.hrl").
 -include_lib("couch/include/couch_db.hrl").
 
--define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).
 -define(TIMEOUT, 1000).
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/7857cf8e/test/couch_mrview_index_info_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_mrview_index_info_tests.erl b/test/couch_mrview_index_info_tests.erl
index aebc443..7afb196 100644
--- a/test/couch_mrview_index_info_tests.erl
+++ b/test/couch_mrview_index_info_tests.erl
@@ -15,7 +15,6 @@
 -include_lib("couch/include/couch_eunit.hrl").
 -include_lib("couch/include/couch_db.hrl").
 
--define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).
 -define(TIMEOUT, 1000).
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/7857cf8e/test/couch_mrview_map_views_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_mrview_map_views_tests.erl b/test/couch_mrview_map_views_tests.erl
index 62049f9..3dc373f 100644
--- a/test/couch_mrview_map_views_tests.erl
+++ b/test/couch_mrview_map_views_tests.erl
@@ -16,7 +16,6 @@
 -include_lib("couch/include/couch_db.hrl").
 
 -define(TIMEOUT, 1000).
--define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).
 
 
 start() ->

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/7857cf8e/test/couch_mrview_red_views_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_mrview_red_views_tests.erl b/test/couch_mrview_red_views_tests.erl
index 382963a..10f0fe3 100644
--- a/test/couch_mrview_red_views_tests.erl
+++ b/test/couch_mrview_red_views_tests.erl
@@ -16,7 +16,6 @@
 -include_lib("couch/include/couch_db.hrl").
 
 -define(TIMEOUT, 1000).
--define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).
 
 
 start() ->


Mime
View raw message