Skip to content

fix(peruser_test): on slow CI vms, we can get Cluster timeouts #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janl merged 3 commits into from
Oct 29, 2017
Merged

fix(peruser_test): on slow CI vms, we can get Cluster timeouts #930

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f465e4a
fix(peruser_test): on slow CI vms, we can get Cluster timeouts
janl Oct 29, 2017
dfb369c
Merge branch 'master' into fix/peruser-tests
janl Oct 29, 2017
0ec285f
Merge branch 'master' into fix/peruser-tests
janl Oct 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions src/couch_peruser/test/couch_peruser_test.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ setup() ->
set_config("couch_peruser", "cluster_start_period", "1"),
set_config("couch_peruser", "enable", "true"),
set_config("cluster", "n", "1"),
set_config("log", "level", "debug"),
timer:sleep(1000),
TestAuthDb.

Expand All @@ -53,7 +52,6 @@ teardown(TestAuthDb) ->
set_config("couch_peruser", "cluster_quiet_period", "60"),
set_config("couch_peruser", "cluster_start_period", "5"),
set_config("cluster", "n", "3"),
set_config("log", "level", "info"),
do_request(delete, get_cluster_base_url() ++ "/" ++ ?b2l(TestAuthDb)),
do_request(delete, get_base_url() ++ "/" ++ ?b2l(TestAuthDb)),
lists:foreach(fun (DbName) ->
Expand Down Expand Up @@ -128,6 +126,10 @@ all_dbs() ->
{ok, 200, _, Body} = do_request(get, get_cluster_base_url() ++ "/_all_dbs"),
jiffy:decode(Body).

all_dbs_with_errors() ->
{Result, StatusCode, _Headers, Body} = do_request(get, get_cluster_base_url() ++ "/_all_dbs"),
{Result, StatusCode, _Headers, jiffy:decode(Body)}.

get_base_url() ->
Addr = config:get("httpd", "bind_address", "127.0.0.1"),
Port = integer_to_list(mochiweb_socket_server:get(couch_httpd, port)),
Expand Down Expand Up @@ -316,21 +318,33 @@ should_remove_user_from_db_members(TestAuthDb) ->
% infinite loop waiting for a db to be created, either this returns true
% or we get a test timeout error
wait_for_db_create(UserDbName) ->
case lists:member(UserDbName, all_dbs()) of
true -> true;
_Else ->
case all_dbs_with_errors() of
{error, _, _ , _} ->
timer:sleep(?WAIT_FOR_DB_TIMEOUT),
wait_for_db_create(UserDbName)
wait_for_db_create(UserDbName);
{ok, _, _, AllDbs} ->
case lists:member(UserDbName, AllDbs) of
true -> true;
_Else ->
timer:sleep(?WAIT_FOR_DB_TIMEOUT),
wait_for_db_create(UserDbName)
end
end.

% infinite loop waiting for a db to be deleted, either this returns true
% or we get a test timeout error
wait_for_db_delete(UserDbName) ->
case not lists:member(UserDbName, all_dbs()) of
true -> true;
_Else ->
case all_dbs_with_errors() of
{ok, 500, _ , _} ->
timer:sleep(?WAIT_FOR_DB_TIMEOUT),
wait_for_db_delete(UserDbName)
wait_for_db_delete(UserDbName);
{ok, _, _, AllDbs} ->
case not lists:member(UserDbName, AllDbs) of
true -> true;
_Else ->
timer:sleep(?WAIT_FOR_DB_TIMEOUT),
wait_for_db_delete(UserDbName)
end
end.

wait_for_security_create(Type, User, UserDbName) ->
Expand Down