summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbenoitc <benoitc@apache.org>2014-02-08 20:20:47 +0100
committerbenoitc <benoitc@apache.org>2014-02-08 20:20:47 +0100
commit29b8a065e4085d061ab4ea1a3fa97b33fd8942b6 (patch)
tree0724f28ed0bcd3dfb63beac0ce2813d0bce798b9
parentc94569a675741f099b7cb62f87599bbd61e907f9 (diff)
downloadcouchdb-29b8a065e4085d061ab4ea1a3fa97b33fd8942b6.tar.gz
couch_mrview: fix 10-index-changes.t
proper test to check the indexer.
-rw-r--r--apps/couch_mrview/test/10-index-changes.t16
1 files changed, 12 insertions, 4 deletions
diff --git a/apps/couch_mrview/test/10-index-changes.t b/apps/couch_mrview/test/10-index-changes.t
index f53e9edcf..ce79eacfc 100644
--- a/apps/couch_mrview/test/10-index-changes.t
+++ b/apps/couch_mrview/test/10-index-changes.t
@@ -175,13 +175,13 @@ test_stream(Db) ->
test_indexer(Db) ->
- Result = run_query(Db, [{since, 14}]),
+ Result = run_query(Db, [{since, 14}, refresh]),
Expect = {ok, 15, [{{15,14,<<"14">>},14}]},
etap:is(Result, Expect, "refresh index by hand OK."),
{ok, Db1} = save_doc(Db, 15),
- timer:sleep(1000),
- Result1 = run_query(Db, [{since, 14}]),
+ timer:sleep(1500),
+ Result1 = run_query(Db1, [{since, 14}], false),
Expect1 = {ok, 16, [{{15,14,<<"14">>},14},
{{16,15,<<"15">>},15}]},
etap:is(Result1, Expect1, "changes indexed in background OK."),
@@ -195,6 +195,9 @@ save_doc(Db, Id) ->
couch_db:reopen(Db).
run_query(Db, Opts) ->
+ run_query(Db, Opts, true).
+
+run_query(Db, Opts, Refresh) ->
Fun = fun
(stop, {LastSeq, Acc}) ->
{ok, LastSeq, Acc};
@@ -203,7 +206,12 @@ run_query(Db, Opts) ->
(Event, Acc) ->
{ok, [Event | Acc]}
end,
- couch_mrview:refresh(Db, <<"_design/bar">>),
+ case Refresh of
+ true ->
+ couch_mrview:refresh(Db, <<"_design/bar">>);
+ false ->
+ ok
+ end,
{ok, LastSeq, R} = couch_mrview_changes:handle_changes(Db, <<"_design/bar">>,
<<"baz">>, Fun, [], Opts),
{ok, LastSeq, lists:reverse(R)}.