You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kl...@apache.org on 2015/08/19 12:26:27 UTC
[1/3] couchdb-peruser git commit: Rename tests
Repository: couchdb-peruser
Updated Branches:
refs/heads/master 8d81a8f76 -> 033768ddf
Rename tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/commit/888a5bd1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/tree/888a5bd1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/diff/888a5bd1
Branch: refs/heads/master
Commit: 888a5bd1fe513220541d7c1ebb99234d09f5ec6d
Parents: 8d81a8f
Author: Klaus Trainer <kl...@posteo.de>
Authored: Wed Aug 19 11:29:59 2015 +0200
Committer: Klaus Trainer <kl...@posteo.de>
Committed: Wed Aug 19 11:29:59 2015 +0200
----------------------------------------------------------------------
test/couchdb_peruser_test.erl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-peruser/blob/888a5bd1/test/couchdb_peruser_test.erl
----------------------------------------------------------------------
diff --git a/test/couchdb_peruser_test.erl b/test/couchdb_peruser_test.erl
index 9bf756d..57a369b 100644
--- a/test/couchdb_peruser_test.erl
+++ b/test/couchdb_peruser_test.erl
@@ -151,7 +151,7 @@ should_reflect_config_changes(TestAuthDb) ->
create_user(TestAuthDb, User),
?_assert(not lists:member(UserDbName, all_dbs())).
-should_assign_user_to_db_admins(TestAuthDb) ->
+should_add_user_to_db_admins(TestAuthDb) ->
User = "qux",
UserDbName = <<"userdb-717578">>,
create_user(TestAuthDb, User),
@@ -159,7 +159,7 @@ should_assign_user_to_db_admins(TestAuthDb) ->
{[{<<"names">>,[<<"qux">>]}]},
proplists:get_value(<<"admins">>, get_security(UserDbName))).
-should_assign_user_to_db_members(TestAuthDb) ->
+should_add_user_to_db_members(TestAuthDb) ->
User = "qux",
UserDbName = <<"userdb-717578">>,
create_user(TestAuthDb, User),
@@ -263,8 +263,8 @@ couchdb_peruser_test_() ->
fun should_not_delete_user_db/1,
fun should_delete_user_db/1,
fun should_reflect_config_changes/1,
- fun should_assign_user_to_db_admins/1,
- fun should_assign_user_to_db_members/1,
+ fun should_add_user_to_db_admins/1,
+ fun should_add_user_to_db_members/1,
fun should_not_remove_existing_db_admins/1,
fun should_not_remove_existing_db_members/1,
fun should_remove_user_from_db_admins/1,
[3/3] couchdb-peruser git commit: Match return values
Posted by kl...@apache.org.
Match return values
Project: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/commit/033768dd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/tree/033768dd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/diff/033768dd
Branch: refs/heads/master
Commit: 033768ddffb84e6e849230e292321ad3531294ce
Parents: a7e74f0
Author: Klaus Trainer <kl...@posteo.de>
Authored: Wed Aug 19 12:23:20 2015 +0200
Committer: Klaus Trainer <kl...@posteo.de>
Committed: Wed Aug 19 12:23:20 2015 +0200
----------------------------------------------------------------------
src/couchdb_peruser.erl | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-peruser/blob/033768dd/src/couchdb_peruser.erl
----------------------------------------------------------------------
diff --git a/src/couchdb_peruser.erl b/src/couchdb_peruser.erl
index 992ac47..a4c8a2e 100644
--- a/src/couchdb_peruser.erl
+++ b/src/couchdb_peruser.erl
@@ -67,7 +67,7 @@ changes_handler({change, {Doc}, _Prepend}, _ResType, State=#state{}) ->
case couch_util:get_value(<<"deleted">>, Doc, false) of
false ->
UserDb = ensure_user_db(User),
- ensure_security(User, UserDb, fun add_user/3),
+ ok = ensure_security(User, UserDb, fun add_user/3),
State;
true ->
case State#state.delete_dbs of
@@ -75,7 +75,8 @@ changes_handler({change, {Doc}, _Prepend}, _ResType, State=#state{}) ->
_UserDb = delete_user_db(User),
State;
false ->
- ensure_security(User, user_db_name(User), fun remove_user/3),
+ UserDb = user_db_name(User),
+ ok = ensure_security(User, UserDb, fun remove_user/3),
State
end
end;
@@ -88,7 +89,10 @@ changes_handler(_Event, _ResType, State) ->
delete_user_db(User) ->
UserDb = user_db_name(User),
try
- fabric:delete_db(UserDb, [?ADMIN_CTX])
+ case fabric:delete_db(UserDb, [?ADMIN_CTX]) of
+ ok -> ok;
+ accepted -> ok
+ end
catch error:database_does_not_exist ->
ok
end,
@@ -97,9 +101,12 @@ delete_user_db(User) ->
ensure_user_db(User) ->
UserDb = user_db_name(User),
try
- fabric:get_db_info(UserDb)
+ {ok, _DbInfo} = fabric:get_db_info(UserDb)
catch error:database_does_not_exist ->
- fabric:create_db(UserDb, [?ADMIN_CTX])
+ case fabric:create_db(UserDb, [?ADMIN_CTX]) of
+ ok -> ok;
+ accepted -> ok
+ end
end,
UserDb.
@@ -149,7 +156,7 @@ ensure_security(User, UserDb, TransformFun) ->
{false, _} ->
ok;
{true, SecProps1} ->
- fabric:set_security(UserDb, {SecProps1}, [?ADMIN_CTX])
+ ok = fabric:set_security(UserDb, {SecProps1}, [?ADMIN_CTX])
end.
user_db_name(User) ->
@@ -196,10 +203,10 @@ code_change(_OldVsn, State, _Extra) ->
%% config_listener callbacks
handle_config_change("couch_httpd_auth", "authentication_db", _Value, _Persist, Server) ->
- gen_server:cast(Server, update_config),
+ ok = gen_server:cast(Server, update_config),
{ok, Server};
handle_config_change("couchdb_peruser", _Key, _Value, _Persist, Server) ->
- gen_server:cast(Server, update_config),
+ ok = gen_server:cast(Server, update_config),
{ok, Server};
handle_config_change(_Section, _Key, _Value, _Persist, Server) ->
{ok, Server}.
[2/3] couchdb-peruser git commit: Improve test setup and teardown
Posted by kl...@apache.org.
Improve test setup and teardown
Project: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/commit/a7e74f02
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/tree/a7e74f02
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-peruser/diff/a7e74f02
Branch: refs/heads/master
Commit: a7e74f02f49c597ce06a55aabb0080965b0e46c9
Parents: 888a5bd
Author: Klaus Trainer <kl...@posteo.de>
Authored: Wed Aug 19 11:39:21 2015 +0200
Committer: Klaus Trainer <kl...@posteo.de>
Committed: Wed Aug 19 11:39:21 2015 +0200
----------------------------------------------------------------------
test/couchdb_peruser_test.erl | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-peruser/blob/a7e74f02/test/couchdb_peruser_test.erl
----------------------------------------------------------------------
diff --git a/test/couchdb_peruser_test.erl b/test/couchdb_peruser_test.erl
index 57a369b..554f55b 100644
--- a/test/couchdb_peruser_test.erl
+++ b/test/couchdb_peruser_test.erl
@@ -18,15 +18,17 @@
-define(ADMIN_USERNAME, "admin").
-define(ADMIN_PASSWORD, "secret").
-start_couch() ->
- test_util:start_couch([chttpd]).
+setup_all() ->
+ TestCtx = test_util:start_couch([chttpd]),
+ config:set("admins", ?ADMIN_USERNAME, ?ADMIN_PASSWORD),
+ TestCtx.
-stop_couch(TestCtx) ->
+teardown_all(TestCtx) ->
+ config:delete("admins", ?ADMIN_USERNAME),
test_util:stop_couch(TestCtx).
setup() ->
TestAuthDb = ?tempdb(),
- config:set("admins", ?ADMIN_USERNAME, ?ADMIN_PASSWORD),
do_request(put, get_base_url() ++ "/" ++ ?b2l(TestAuthDb)),
set_config("couch_httpd_auth", "authentication_db", ?b2l(TestAuthDb)),
set_config("couchdb_peruser", "enable", "true"),
@@ -39,8 +41,7 @@ teardown(TestAuthDb) ->
do_request(delete, get_base_url() ++ "/" ++ ?b2l(TestAuthDb)),
lists:foreach(fun (DbName) ->
delete_db(DbName)
- end, all_dbs()),
- config:delete("admins", ?ADMIN_USERNAME).
+ end, all_dbs()).
set_config(Section, Key, Value) ->
Url = lists:concat([
@@ -254,7 +255,7 @@ couchdb_peruser_test_() ->
"couchdb_peruser test",
{
setup,
- fun start_couch/0, fun stop_couch/1,
+ fun setup_all/0, fun teardown_all/1,
{
foreach,
fun setup/0, fun teardown/1,