Skip to content

feat(test): wait for db and index shutdown #568

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 1 commit into from
Jun 3, 2017
Merged

feat(test): wait for db and index shutdown #568

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 23 additions & 10 deletions src/couch/test/couchdb_views_tests.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,11 @@ couchdb_1283() ->
ok = populate_db(MDb1, 100, 100),
query_view(MDb1#db.name, "foo", "foo"),
ok = couch_db:close(MDb1),
% monitor db and index pids
{ok, DDPid} = couch_index_server:get_index(
couch_mrview_index, MDb1#db.name, <<"_design/foo">>),
DesignDocMonRef = erlang:monitor(process, DDPid),
DatabaseMonRef = erlang:monitor(process, MDb1#db.main_pid),

{ok, Db1} = couch_db:create(?tempdb(), [?ADMIN_CTX]),
ok = couch_db:close(Db1),
Expand All @@ -350,6 +355,11 @@ couchdb_1283() ->
{ok, Db3} = couch_db:create(?tempdb(), [?ADMIN_CTX]),
ok = couch_db:close(Db3),

wait_for_process_shutdown(DatabaseMonRef, killed,
{reason, "Failure waiting for db shutdown"}),
wait_for_process_shutdown(DesignDocMonRef, normal,
{reason, "Failure waiting for view index shutdown"}),

Writer1 = spawn_writer(Db1#db.name),
Writer2 = spawn_writer(Db2#db.name),

Expand Down Expand Up @@ -380,16 +390,8 @@ couchdb_1283() ->

%% Resume compaction
erlang:resume_process(CPid),

receive
{'DOWN', MonRef, process, _, Reason} ->
?assertEqual(normal, Reason)
after ?TIMEOUT ->
erlang:error(
{assertion_failed,
[{module, ?MODULE}, {line, ?LINE},
{reason, "Failure compacting view group"}]})
end,
wait_for_process_shutdown(MonRef, normal,
{reason, "Failure compacting view group"}),

?assertEqual(ok, writer_try_again(Writer3)),
?assertEqual(ok, get_writer_status(Writer3)),
Expand All @@ -403,6 +405,17 @@ couchdb_1283() ->
?assertEqual(ok, stop_writer(Writer3))
end).

wait_for_process_shutdown(Pid, ExpectedReason, Error) ->
receive
{'DOWN', Pid, process, _, Reason} ->
?assertEqual(ExpectedReason, Reason)
after ?TIMEOUT ->
erlang:error(
{assertion_failed,
[{module, ?MODULE}, {line, ?LINE}, Error]})
end.


create_doc(DbName, DocId) when is_list(DocId) ->
create_doc(DbName, ?l2b(DocId));
create_doc(DbName, DocId) when is_binary(DocId) ->
Expand Down